fix http listener and dont ignore errors from http listener (#241)

jkroepke · Apr 3, 2024 · f35271f · f35271f
1 parent 39487b8
commit f35271f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/internal/httpserver/main.go b/internal/httpserver/main.go
@@ -47,7 +47,7 @@ func (s *Server) Listen(ctx context.Context) error {
 
 	s.server.BaseContext = func(_ net.Listener) context.Context { return ctx }
 
-	var errCh chan error
+	errCh := make(chan error)
 
 	if s.conf.TLS {
 		s.logger.Info(fmt.Sprintf(
@@ -70,11 +70,13 @@ func (s *Server) Listen(ctx context.Context) error {
 		))
 
 		go func() {
-			errCh <- s.server.ListenAndServeTLS("", "")
+			errCh <- s.server.ListenAndServe()
 		}()
 	}
 
 	select {
+	case err := <-errCh:
+		return fmt.Errorf("error http %s listening: %w", s.name, err)
 	case <-ctx.Done():
 		s.logger.Info(fmt.Sprintf("start graceful shutdown of http %s listener", s.name))
 
@@ -85,8 +87,6 @@ func (s *Server) Listen(ctx context.Context) error {
 		}
 
 		s.logger.Info(fmt.Sprintf("http %s listener successfully terminated", s.name))
-	case err := <-errCh:
-		return fmt.Errorf("error http %s listening: %w", s.name, err)
 	}
 
 	return nil