Merge pull request #1717 from improbable-io/forks/v0.13.0

make Monitor shut down the process hard if it fails to shutdown grace…
coreos · Dec 19, 2016 · 4249a49 · 4249a49
2 parents 79449f7 + 3b22e3d
commit 4249a49
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/server.go b/server/server.go
@@ -276,8 +276,8 @@ func (s *Server) Supervise() {
 	select {
 	case <-done:
 	case <-time.After(shutdownTimeout):
-		log.Errorf("Timed out waiting for server to shut down")
-		sd = true
+		log.Errorf("Timed out waiting for server to shut down. Panicking the server without cleanup.")
+		panic("Failed server shutdown. Panic")
 	}
 	if !sd {
 		log.Infof("Restarting server")