Fix stopped server errors

matthiasBT · Jan 13, 2024 · 065a2f4 · 065a2f4
1 parent ef59eb3
commit 065a2f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -52,7 +52,7 @@ func main() {
 	srv := http.Server{Addr: conf.Addr, Handler: r}
 	go func() {
 		logger.Infof("Launching the server at %s\n", conf.Addr)
-		if err := srv.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) {
+		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			logger.Fatal(err)
 		}
 	}()

diff --git a/cmd/servergrpc/main.go b/cmd/servergrpc/main.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"errors"
 	"log"
 	"net"
 
@@ -12,6 +13,7 @@ import (
 	"github.com/matthiasBT/monitoring/internal/infra/utils"
 	"github.com/matthiasBT/monitoring/internal/server/adapters"
 	"github.com/matthiasBT/monitoring/internal/server/startup"
+	"google.golang.org/grpc"
 )
 
 var (
@@ -55,7 +57,7 @@ func main() {
 		if err != nil {
 			log.Fatalf("failed to listen: %v", err)
 		}
-		if err := srv.Serve(lis); err != nil { // TODO: !errors.Is(err, http.ErrServerClosed) ?
+		if err := srv.Serve(lis); err != nil && !errors.Is(err, grpc.ErrServerStopped) {
 			log.Fatalf("failed to serve: %v", err)
 		}
 	}()