- bugfix: do not halt stop sequence in case of service error

1 files changed, 3 insertions, 2 deletions

diff --git a/service/container.go b/service/container.go
index 1e2e1d51..a21b49b4 100644
--- a/service/container.go
+++ b/service/container.go
@@ -180,6 +180,7 @@ func (c *container) Serve() error {
 		}(e)
 	}
 
+	var serveErr error
 	for i := 0; i < numServing; i++ {
 		result := <-done
 
@@ -191,11 +192,11 @@ func (c *container) Serve() error {
 		// found an error in one of the services, stopping the rest of running services.
 		if err := result.(error); err != nil {
 			c.Stop()
-			return err
+			serveErr = err
 		}
 	}
 
-	return nil
+	return serveErr
 }
 
 // Detach sends stop command to all running services.