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

Registry: Fix service shutdown mode trigger location (#28025)

Browse Source
This commit is contained in:
Amos Law
2020-10-05 07:30:46 -04:00
committed by GitHub
parent 531c579341
commit 3a498e80ff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/server/server.go
View File

@ -179,10 +179,10 @@ func (s *Server) Run() (err error) {
} }
err := service.Run(s.context) err := service.Run(s.context)
// Mark that we are in shutdown mode
// So no more services are started
s.shutdownInProgress = true
if err != nil { if err != nil {
// Mark that we are in shutdown mode
// So no more services are started
s.shutdownInProgress = true
if err != context.Canceled { if err != context.Canceled {
// Server has crashed. // Server has crashed.
s.log.Error("Stopped "+descriptor.Name, "reason", err) s.log.Error("Stopped "+descriptor.Name, "reason", err)