service: fix shutdown bugv0.4.2

1 files changed, 11 insertions, 12 deletions

diff --git a/service/app_runner.go b/service/app_runner.go
index 9d281cf..3d30571 100644
--- a/service/app_runner.go
+++ b/service/app_runner.go
@@ -116,19 +116,18 @@ func (r *AppRunner) RunForever(enableBg bool) {
         // 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
+                goto done
         case <-r.sigs:
-                r.Logger.Info("Shutting down main app context")
-                r.ctxCancel()
+                goto done
+        }
 
-                r.Logger.Info("Waiting for jobs to terminate")
-                r.wg.Wait()
+done:
+        r.Logger.Info("Shutting down main app context")
+        r.ctxCancel()
 
-                r.Logger.Info("Shutdown completed")
-                return
-        }
+        r.Logger.Info("Waiting for jobs to terminate")
+        r.wg.Wait()
+
+        r.Logger.Info("Shutdown completed")
+        return
 }