From 3c7cfbebe89515d670da813abf37cad1e54c569b Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Wed, 27 Nov 2019 13:42:15 +0100 Subject: [PATCH] Server: Defer wg.Done call to ensure it's called (#20700) --- pkg/api/http_server.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go index 5d49bd6ad83..48f677b838f 100644 --- a/pkg/api/http_server.go +++ b/pkg/api/http_server.go @@ -135,11 +135,12 @@ func (hs *HTTPServer) Run(ctx context.Context) error { // handle http shutdown on server context done go func() { + defer wg.Done() + <-ctx.Done() if err := hs.httpSrv.Shutdown(context.Background()); err != nil { hs.log.Error("Failed to shutdown server", "error", err) } - wg.Done() }() switch setting.Protocol {