Wait for ctx.Done

nextmn · Dec 12, 2024 · 03d647e · 03d647e
1 parent a256595
commit 03d647e
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/internal/app/setup.go b/internal/app/setup.go
@@ -40,10 +40,13 @@ func (s Setup) Run(ctx context.Context) error {
 	if err := s.HTTPServer.Start(ctx); err != nil {
 		return err
 	}
-	ctxShutdown, cancel := context.WithTimeout(ctx, 1*time.Second)
-	defer cancel()
-	// Try to end before 1s…
-	s.HTTPServer.WaitShutdown(ctxShutdown)
-	s.Upf.WaitShutdown(ctxShutdown)
+	select {
+	case <-ctx.Done():
+		ctxShutdown, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+		defer cancel()
+		// Try to end before 1s…
+		s.HTTPServer.WaitShutdown(ctxShutdown)
+		s.Upf.WaitShutdown(ctxShutdown)
+	}
 	return nil
 }