1 files changed, 13 insertions, 10 deletions
diff --git a/manager/service.go b/manager/service.go
index 30567811..44b5456e 100644
--- a/manager/service.go
+++ b/manager/service.go
@@ -30,6 +30,17 @@ import (
 
 type managerService struct{}
 
+func printPanic() {
+	if x := recover(); x != nil {
+		for _, line := range append([]string{fmt.Sprint(x)}, strings.Split(string(debug.Stack()), "\n")...) {
+			if len(strings.TrimSpace(line)) > 0 {
+				log.Println(line)
+			}
+		}
+		panic(x)
+	}
+}
+
 func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (svcSpecificEC bool, exitCode uint32) {
 	changes <- svc.Status{State: svc.StartPending}
 
@@ -50,16 +61,7 @@ func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest
 		serviceError = services.ErrorRingloggerOpen
 		return
 	}
-	defer func() {
-		if x := recover(); x != nil {
-			for _, line := range append([]string{fmt.Sprint(x)}, strings.Split(string(debug.Stack()), "\n")...) {
-				if len(strings.TrimSpace(line)) > 0 {
-					log.Println(line)
-				}
-			}
-			panic(x)
-		}
-	}()
+	defer printPanic()
 
 	log.Println("Starting", version.UserAgent())
 
@@ -239,6 +241,7 @@ func (service *managerService) Execute(args []string, r <-chan svc.ChangeRequest
 	goStartProcess := func(session uint32) {
 		procsGroup.Add(1)
 		go func() {
+			defer printPanic()
 			startProcess(session)
 			procsGroup.Done()
 		}()