merged upstream

elastic · Aug 21, 2015 · b1f7d09 · b1f7d09
2 parents 2f58df2 + 86d6de7
commit b1f7d09
Show file tree

Hide file tree

Showing 15 changed files with 167 additions and 31 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/publisher/publish.go b/Godeps/_workspace/src/github.com/elastic/libbeat/publisher/publish.go
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/service/service_windows.go b/Godeps/_workspace/src/github.com/elastic/libbeat/service/service_windows.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo.go b/Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/internal/commandinfo_test.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub_test.go
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/emitterc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/encode_test.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/encode_test.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go b/Godeps/_workspace/src/gopkg.in/yaml.v2/yaml.go
diff --git a/main.go b/main.go
@@ -54,12 +54,12 @@ func main() {
 	cfgfile.CmdLineFlags(cmdLine, Name)
 	logp.CmdLineFlags(cmdLine)
 	service.CmdLineFlags(cmdLine)
+	publisher.CmdLineFlags(cmdLine)
 
 	file := cmdLine.String("I", "", "file")
 	loop := cmdLine.Int("l", 1, "Loop file. 0 - loop forever")
 	oneAtAtime := cmdLine.Bool("O", false, "Read packets one at a time (press Enter)")
 	topSpeed := cmdLine.Bool("t", false, "Read packets as fast as possible, without sleeping")
-	publishDisabled := cmdLine.Bool("N", false, "Disable actual publishing for testing")
 	printVersion := cmdLine.Bool("version", false, "Print version and exit")
 	dumpfile := cmdLine.String("dump", "", "Write all captured packets to this libpcap file.")
 
@@ -90,8 +90,7 @@ func main() {
 	}
 
 	logp.Debug("main", "Initializing output plugins")
-	if err = publisher.Publisher.Init(*publishDisabled, config.ConfigSingleton.Output,
-		config.ConfigSingleton.Shipper); err != nil {
+	if err = publisher.Publisher.Init(config.ConfigSingleton.Output, config.ConfigSingleton.Shipper); err != nil {
 
 		logp.Critical(err.Error())
 		os.Exit(1)

diff --git a/out.prof b/out.prof