Merge branch 'feature/GracefulStop' into 'master'

implement graceful stop using GracefulStop See merge request !81
projecteru2 · Apr 17, 2017 · cb01060 · cb01060
2 parents 7701415 + 300da63
commit cb01060
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.28a
+0.7.29
diff --git a/main.go b/main.go
@@ -27,13 +27,6 @@ var (
 	logLevel   string
 )
 
-func waitSignal() {
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, syscall.SIGINT, syscall.SIGHUP, syscall.SIGKILL, syscall.SIGTERM, syscall.SIGQUIT)
-	<-c
-	log.Info("Terminating...")
-}
-
 func setupLog(l string) error {
 	level, err := log.ParseLevel(l)
 	if err != nil {
@@ -106,7 +99,13 @@ func serve() {
 	go http.ListenAndServe(":46656", nil)
 
 	log.Info("Cluster started successfully.")
-	waitSignal()
+
+	// wait for unix signals and try to GracefulStop
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, syscall.SIGINT, syscall.SIGHUP, syscall.SIGTERM)
+	<-sigs
+	grpcServer.GracefulStop()
+	log.Info("Terminating...")
 }
 
 func main() {