From 8e29300f85c2db7aab0da82c68b0e6b90acaa6cb Mon Sep 17 00:00:00 2001
From: liminggui <linuxphp@126.com>
Date: Fri, 5 Jun 2020 18:27:05 +0800
Subject: [PATCH] fix graceful bug

---
 app.go          | 5 ++---
 grace/server.go | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app.go b/app.go
index 88403201..f3fe6f7b 100644
--- a/app.go
+++ b/app.go
@@ -130,7 +130,6 @@ func (app *App) Run(mws ...MiddleWare) {
 					if err := server.ListenAndServeMutualTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile, BConfig.Listen.TrustCaFile); err != nil {
 						logs.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid()))
 						time.Sleep(100 * time.Microsecond)
-						endRunning <- true
 					}
 				} else {
 					if BConfig.Listen.AutoTLS {
@@ -145,9 +144,9 @@ func (app *App) Run(mws ...MiddleWare) {
 					if err := server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile); err != nil {
 						logs.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid()))
 						time.Sleep(100 * time.Microsecond)
-						endRunning <- true
 					}
 				}
+				endRunning <- true
 			}()
 		}
 		if BConfig.Listen.EnableHTTP {
@@ -161,8 +160,8 @@ func (app *App) Run(mws ...MiddleWare) {
 				if err := server.ListenAndServe(); err != nil {
 					logs.Critical("ListenAndServe: ", err, fmt.Sprintf("%d", os.Getpid()))
 					time.Sleep(100 * time.Microsecond)
-					endRunning <- true
 				}
+				endRunning <- true
 			}()
 		}
 		<-endRunning
diff --git a/grace/server.go b/grace/server.go
index 1ce8bc78..0af466a8 100644
--- a/grace/server.go
+++ b/grace/server.go
@@ -180,7 +180,7 @@ func (srv *Server) ListenAndServeMutualTLS(certFile, keyFile, trustFile string)
 			log.Println(err)
 			return err
 		}
-		err = process.Kill()
+		err = process.Signal(syscall.SIGTERM)
 		if err != nil {
 			return err
 		}