Fix issue with waiting on panicing processes hanging forever.

This should close #58.
thejerf · Feb 16, 2022 · 0cef8e8 · 0cef8e8
1 parent 511b0e3
commit 0cef8e8
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/v4/supervisor.go b/v4/supervisor.go
@@ -548,11 +548,21 @@ func (s *Supervisor) runService(ctx context.Context, service Service, id service
 			}()
 		}
 
-		err := service.Serve(childCtx)
-		cancel()
-		close(done)
+		var err error
+
+		defer func() {
+			cancel()
+			close(done)
+
+			r := recover()
+			if r == nil {
+				s.serviceEnded(id, err)
+			} else {
+				panic(r)
+			}
+		}()
 
-		s.serviceEnded(id, err)
+		err = service.Serve(childCtx)
 	}()
 }