server: run cleanupFunc before Exit (cosmos#4324)

Ensure gaiad shutdown Tendermint gracefully upon receiving SIGINT and SIGTERM. Closes: cosmos#4323
ggomma · May 11, 2019 · 77c0420 · 77c0420
1 parent 829ce17
commit 77c0420
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/server/util.go b/server/util.go
@@ -216,14 +216,17 @@ func TrapSignal(cleanupFunc func()) {
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		sig := <-sigs
+		if cleanupFunc != nil {
+			cleanupFunc()
+		}
+		exitCode := 128
 		switch sig {
-		case syscall.SIGTERM:
-			defer cleanupFunc()
-			os.Exit(128 + int(syscall.SIGTERM))
 		case syscall.SIGINT:
-			defer cleanupFunc()
-			os.Exit(128 + int(syscall.SIGINT))
+			exitCode += int(syscall.SIGINT)
+		case syscall.SIGTERM:
+			exitCode += int(syscall.SIGTERM)
 		}
+		os.Exit(exitCode)
 	}()
 }