HTTP and SMTP Server: Checking for non-nil error before comparing to …

…ErrServerClosed
programmfabrik · Jul 2, 2024 · e110c58 · e110c58
1 parent 58bd796
commit e110c58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/http_server.go b/http_server.go
@@ -66,7 +66,7 @@ func (ats *Suite) StartHttpServer() {
 		}
 
 		err := ats.httpServer.ListenAndServe()
-		if !errors.Is(err, http.ErrServerClosed) {
+		if err != nil && !errors.Is(err, http.ErrServerClosed) {
 			// Error starting or closing listener:
 			logrus.Fatal("HTTP server ListenAndServe:", err)
 		}

diff --git a/smtp_server.go b/smtp_server.go
@@ -24,7 +24,7 @@ func (ats *Suite) StartSmtpServer() {
 		}
 
 		err := ats.smtpServer.ListenAndServe()
-		if !errors.Is(err, esmtp.ErrServerClosed) {
+		if err != nil && !errors.Is(err, esmtp.ErrServerClosed) {
 			// Error starting or closing listener:
 			logrus.Fatal("SMTP server ListenAndServe:", err)
 		}