fix web server shutdown message (#181)

Signed-off-by: Maksim Paskal <paskal.maksim@gmail.com>
maksim-paskal · Oct 5, 2023 · 4fa8f46 · 4fa8f46
1 parent a79741a
commit 4fa8f46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/main/main.go b/cmd/main/main.go
@@ -136,8 +136,6 @@ func main() {
 		go RunLeaderElection(ctx)
 	}
 
-	go web.StartServer(ctx)
-
 	go func() {
 		select {
 		case <-signalChanInterrupt:
@@ -156,6 +154,8 @@ func main() {
 		time.Sleep(config.Get().GetGracefulShutdown())
 	})
 
+	go web.StartServer(ctx)
+
 	<-ctx.Done()
 
 	log.Info("Shutting down...")

diff --git a/pkg/web/web.go b/pkg/web/web.go
@@ -137,7 +137,7 @@ func StartServer(ctx context.Context) {
 		_ = server.Shutdown(ctx) //nolint:contextcheck
 	}()
 
-	if err := server.ListenAndServe(); err != nil && ctx.Err() != nil {
+	if err := server.ListenAndServe(); err != nil && ctx.Err() == nil {
 		log.WithError(err).Fatal()
 	}
 }