1 files changed, 6 insertions, 0 deletions

diff --git a/service/app_runner.go b/service/app_runner.go
index a960e70..9d281cf 100644
--- a/service/app_runner.go
+++ b/service/app_runner.go
@@ -115,6 +115,12 @@ func (r *AppRunner) RunForever(enableBg bool) {
         // go run foreground
         // go run background if enabled
         select {
+        case <-r.ctx.Done():
+                r.Logger.Info("Waiting for jobs to terminate")
+                r.wg.Wait()
+
+                r.Logger.Info("Shutdown completed")
+                return
         case <-r.sigs:
                 r.Logger.Info("Shutting down main app context")
                 r.ctxCancel()