Do not exit with fatal when the http server successfully closes (#727)

* Do not exit with fatal when the http server successfully closes * whitespace change Co-authored-by: Joe Webster <websterj@netapp.com>
NetApp · Aug 20, 2021 · ddddc0b · ddddc0b
1 parent c72b82e
commit ddddc0b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/frontend/metrics/plugin.go b/frontend/metrics/plugin.go
@@ -38,7 +38,11 @@ func (s *Server) Activate() error {
 	go func() {
 		log.WithField("address", s.server.Addr).Info("Activating metrics frontend.")
 		http.Handle("/metrics", s.server.Handler)
-		if err := s.server.ListenAndServe(); err != nil {
+
+		err := s.server.ListenAndServe()
+		if err == http.ErrServerClosed {
+			log.WithField("address", s.server.Addr).Info("Metrics frontend server has closed.")
+		} else if err != nil {
 			log.Fatal(err)
 		}
 	}()

diff --git a/frontend/rest/apiserver_http.go b/frontend/rest/apiserver_http.go
@@ -40,8 +40,11 @@ func NewHTTPServer(p core.Orchestrator, address, port string) *APIServerHTTP {
 func (s *APIServerHTTP) Activate() error {
 	go func() {
 		log.WithField("address", s.server.Addr).Info("Activating HTTP REST frontend.")
+
 		err := s.server.ListenAndServe()
-		if err != nil {
+		if err == http.ErrServerClosed {
+			log.WithField("address", s.server.Addr).Info("HTTP REST frontend server has closed.")
+		} else if err != nil {
 			log.Fatal(err)
 		}
 	}()

diff --git a/frontend/rest/apiserver_https.go b/frontend/rest/apiserver_https.go
@@ -66,8 +66,11 @@ func NewHTTPSServer(
 func (s *APIServerHTTPS) Activate() error {
 	go func() {
 		log.WithField("address", s.server.Addr).Infof("Activating HTTPS REST frontend.")
+
 		err := s.server.ListenAndServeTLS(s.serverCertFile, s.serverKeyFile)
-		if err != nil {
+		if err == http.ErrServerClosed {
+			log.WithField("address", s.server.Addr).Info("HTTPS REST frontend server has closed.")
+		} else if err != nil {
 			log.Fatal(err)
 		}
 	}()