Merge pull request elastic#185 from tsg/winservice

Basic windows service functionality
tsg · Jul 24, 2015 · 84ee865 · 84ee865
2 parents 5426282 + 2886941
commit 84ee865
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 8 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/logp/log.go b/Godeps/_workspace/src/github.com/elastic/libbeat/logp/log.go
diff --git a/Godeps/_workspace/src/github.com/elastic/libbeat/service/service_unix.go b/Godeps/_workspace/src/github.com/elastic/libbeat/service/service_unix.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/main.go b/main.go
@@ -20,6 +20,7 @@ import (
 	"github.com/elastic/libbeat/filters/nop"
 	"github.com/elastic/libbeat/logp"
 	"github.com/elastic/libbeat/publisher"
+	"github.com/elastic/libbeat/service"
 
 	"github.com/elastic/packetbeat/config"
 	"github.com/elastic/packetbeat/procs"
@@ -231,9 +232,14 @@ func main() {
 	go func() {
 		<-sigc
 		logp.Debug("signal", "Received sigterm/sigint, stopping")
-		sniff.Stop()
 	}()
 
+	// Handle the Windows service events
+	go service.ProcessWindowsControlEvents(func() {
+		logp.Debug("signal", "Received svc stop/shutdown request")
+		sniff.Stop()
+	})
+
 	// Startup successful, disable stderr logging if requested by
 	// cmdline flag
 	logp.SetStderr()