chore: refactor signal sigterm and sigint (#3632)

core/proc/shutdown.go

@@ -52,10 +52,10 @@ func WrapUp() {
 	wrapUpListeners.notifyListeners()
 }
 
-func gracefulStop(signals chan os.Signal) {
+func gracefulStop(signals chan os.Signal, sig syscall.Signal) {
 	signal.Stop(signals)
 
-	logx.Info("Got signal SIGTERM, shutting down...")
+	logx.Infof("Got signal %d, shutting down...", sig)
 	go wrapUpListeners.notifyListeners()
 
 	time.Sleep(wrapUpTime)
@@ -63,7 +63,7 @@ func gracefulStop(signals chan os.Signal) {
 
 	time.Sleep(delayTimeBeforeForceQuit - wrapUpTime)
 	logx.Infof("Still alive after %v, going to force kill the process...", delayTimeBeforeForceQuit)
-	syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
+	_ = syscall.Kill(syscall.Getpid(), sig)
 }
 
 type listenerManager struct {

core/proc/signals.go

@@ -34,14 +34,12 @@ func init() {
 					profiler.Stop()
 					profiler = nil
 				}
-			case syscall.SIGTERM, syscall.SIGINT:
+			case syscall.SIGTERM:
-				select {
+				stopOnSignal()
-				case <-done:
+				gracefulStop(signals, syscall.SIGTERM)
-					// already closed
+			case syscall.SIGINT:
-				default:
+				stopOnSignal()
-					close(done)
+				gracefulStop(signals, syscall.SIGINT)
-				}
-				gracefulStop(signals)
 			default:
 				logx.Error("Got unregistered signal:", v)
 			}
@@ -53,3 +51,12 @@ func init() {
 func Done() <-chan struct{} {
 	return done
 }
+
+func stopOnSignal() {
+	select {
+	case <-done:
+		// already closed
+	default:
+		close(done)
+	}
+}