Graceful shutdown on error for httpd, smtpd, pop3d

smtpd/listener.go

@@ -78,16 +78,20 @@ func (s *Server) Start() {
 		cfg.IP4address, cfg.IP4port))
 	if err != nil {
 		log.Errorf("Failed to build tcp4 address: %v", err)
-		// TODO More graceful early-shutdown procedure
-		panic(err)
+		// serve() never called, so we do local shutdown here
+		close(s.localShutdown)
+		s.emergencyShutdown()
+		return
 	}
 
 	log.Infof("SMTP listening on TCP4 %v", addr)
 	s.listener, err = net.ListenTCP("tcp4", addr)
 	if err != nil {
 		log.Errorf("SMTP failed to start tcp4 listener: %v", err)
-		// TODO More graceful early-shutdown procedure
-		panic(err)
+		// serve() never called, so we do local shutdown here
+		close(s.localShutdown)
+		s.emergencyShutdown()
+		return
 	}
 
 	if !s.storeMessages {
@@ -141,9 +145,9 @@ func (s *Server) serve() {
 					close(s.localShutdown)
 					return
 				default:
-					// TODO Implement a max error counter before shutdown?
-					// or maybe attempt to restart smtpd
-					panic(err)
+					close(s.localShutdown)
+					s.emergencyShutdown()
+					return
 				}
 			}
 		} else {
@@ -155,6 +159,15 @@ func (s *Server) serve() {
 	}
 }
 
+func (s *Server) emergencyShutdown() {
+	// Shutdown Inbucket
+	select {
+	case _ = <-s.globalShutdown:
+	default:
+		close(s.globalShutdown)
+	}
+}
+
 // Drain causes the caller to block until all active SMTP sessions have finished
 func (s *Server) Drain() {
 	// Wait for listener to exit