opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 04:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: improved handling of http server shutdown

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-05-01 14:13:38 +02:00
parent 0fc4da810f
commit 13e015fe3f
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/http_server.go
View File

@ -60,6 +60,16 @@ func (hs *HTTPServer) Start(ctx context.Context) error {
hs.log.Info("Initializing HTTP Server", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl, "socket", setting.SocketPath)
hs.httpSrv = &http.Server{Addr: listenAddr, Handler: hs.macaron}
// handle http shutdown on server context done
go func() {
<-ctx.Done()
if err := hs.httpSrv.Shutdown(context.Background()); err != nil {
hs.log.Error("Failed to shutdown server", "error", err)
}
hs.log.Info("Stopped HTTP Server")
}()
switch setting.Protocol {
case setting.HTTP:
err = hs.httpSrv.ListenAndServe()