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

3a498e80 · Amos Law · GitHub · 531c5793 · 3a498e80
Commit 3a498e80 authored Oct 05, 2020 by Amos Law Committed by GitHub Oct 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

pkg/server/server.go
+3 -3

No files found.
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -179,10 +179,10 @@ func (s *Server) Run() (err error) {
 			}

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