Merge pull request #32 from acoshift/apps/wait

apps: wait each app on graceful
moonrhythm · May 18, 2018 · 89e5305 · 89e5305
2 parents 9c2f2ed + fe7d2ba
commit 89e5305
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/apps.go b/apps.go
@@ -160,10 +160,15 @@ func (gs *GracefulShutdownApps) ListenAndServe() error {
 			wg.Add(1)
 			go func() {
 				ctx := shutdownCtx
-				if app.gracefulShutdown != nil && app.gracefulShutdown.timeout > 0 {
-					var cancel context.CancelFunc
-					ctx, cancel = context.WithTimeout(shutdownCtx, app.gracefulShutdown.timeout)
-					defer cancel()
+				if app.gracefulShutdown != nil {
+					if app.gracefulShutdown.wait > 0 {
+						time.Sleep(app.gracefulShutdown.wait)
+					}
+					if app.gracefulShutdown.timeout > 0 {
+						var cancel context.CancelFunc
+						ctx, cancel = context.WithTimeout(shutdownCtx, app.gracefulShutdown.timeout)
+						defer cancel()
+					}
 				}
 				err := app.srv.Shutdown(ctx)
 				if err != nil {