From 313be996cd9ed3c4bc2647b6303d651c4b487fd3 Mon Sep 17 00:00:00 2001 From: nuczzz Date: Fri, 18 Jan 2019 19:33:45 +0800 Subject: [PATCH] call cancel after shutdown --- grace/server.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/grace/server.go b/grace/server.go index ade05ef7..ac3eefa7 100644 --- a/grace/server.go +++ b/grace/server.go @@ -268,7 +268,9 @@ func (srv *Server) shutdown() { log.Println(syscall.Getpid(), "Waiting for connections to finish...") ctx := context.Background() if DefaultTimeout >= 0 { - ctx, _ = context.WithTimeout(context.Background(), DefaultTimeout) + var cancel context.CancelFunc + ctx, cancel = context.WithTimeout(context.Background(), DefaultTimeout) + defer cancel() } srv.terminalChan <- srv.Server.Shutdown(ctx) }