IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Server: Defer wg.Done call to ensure it's called (#20700)

Browse Source
This commit is contained in:
Arve Knudsen 2019-11-27 13:42:15 +01:00 committed by GitHub
parent 1751770394
commit 3c7cfbebe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/http_server.go
View File

@ -135,11 +135,12 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
// handle http shutdown on server context done // handle http shutdown on server context done
go func() { go func() {
defer wg.Done()
<-ctx.Done() <-ctx.Done()
if err := hs.httpSrv.Shutdown(context.Background()); err != nil { if err := hs.httpSrv.Shutdown(context.Background()); err != nil {
hs.log.Error("Failed to shutdown server", "error", err) hs.log.Error("Failed to shutdown server", "error", err)
} }
wg.Done()
}() }()
switch setting.Protocol { switch setting.Protocol {