Fixed http listener error. (zeromicro#843)

suxiwu1987 · Jul 24, 2021 · b812e74 · b812e74
1 parent 089cdaa
commit b812e74
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/rest/internal/starter.go b/rest/internal/starter.go
@@ -23,15 +23,19 @@ func StartHttps(host string, port int, certFile, keyFile string, handler http.Ha
 	})
 }
 
-func start(host string, port int, handler http.Handler, run func(srv *http.Server) error) error {
+func start(host string, port int, handler http.Handler, run func(srv *http.Server) error) (err error) {
 	server := &http.Server{
 		Addr:    fmt.Sprintf("%s:%d", host, port),
 		Handler: handler,
 	}
 	waitForCalled := proc.AddWrapUpListener(func() {
 		server.Shutdown(context.Background())
 	})
-	defer waitForCalled()
+	defer func() {
+		if err == http.ErrServerClosed {
+			waitForCalled()
+		}
+	}()
 
 	return run(server)
 }