Merge pull request beego#3739 from nuczzz/develop

fix graceful bug: old process didn't exist when graceful restart
qiaoshuai2566348 · Jun 22, 2020 · f5c580a · f5c580a
2 parents 7210dc2 + 32cd763
commit f5c580a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/grace/server.go b/grace/server.go
@@ -46,7 +46,10 @@ func (srv *Server) Serve() (err error) {
 
 	log.Println(syscall.Getpid(), srv.ln.Addr(), "Listener closed.")
 	// wait for Shutdown to return
-	return <-srv.terminalChan
+	if shutdownErr := <-srv.terminalChan; shutdownErr != nil {
+		return shutdownErr
+	}
+	return
 }
 
 // ListenAndServe listens on the TCP network address srv.Addr and then calls Serve