Fix integration of Lifecycle and health

Author: jesko-plitt

CHANGELOG.md

@@ -1,5 +1,9 @@
 # vNext
 
+# v1.4.4
+
+- (bug) Fix integration of Lifecycle and health
+
 # v1.4.3
 
 - (improvement) Initialize json implementation on startup

app/lifecycle.go

@@ -5,9 +5,10 @@ import "context"
 type LifecycleHook func(ctx context.Context) error
 
 type Lifecycle struct {
-	onStart    []LifecycleHook
-	onStop     []LifecycleHook
-	onStopLast []LifecycleHook
+	onStart     []LifecycleHook
+	onStopFirst []LifecycleHook
+	onStop      []LifecycleHook
+	onStopLast  []LifecycleHook
 }
 
 func NewLifecycle() *Lifecycle {
@@ -27,6 +28,12 @@ func (l *Lifecycle) Start(ctx context.Context) error {
 func (l *Lifecycle) Stop() error {
 	ctx := context.Background()
 
+	for _, hook := range l.onStopFirst {
+		if err := hook(ctx); err != nil {
+			return err
+		}
+	}
+
 	for _, hook := range l.onStop {
 		if err := hook(ctx); err != nil {
 			return err
@@ -50,6 +57,10 @@ func (l *Lifecycle) OnStop(hook LifecycleHook) {
 	l.onStop = append(l.onStop, hook)
 }
 
+func (l *Lifecycle) OnStopFirst(hook LifecycleHook) {
+	l.onStopFirst = append(l.onStopFirst, hook)
+}
+
 func (l *Lifecycle) OnStopLast(hook LifecycleHook) {
 	l.onStopLast = append(l.onStopLast, hook)
 }

health/service.go

@@ -26,7 +26,7 @@ func New(logger golog.Logger, lifecycle *app.Lifecycle) *Service {
 		logger:     logger,
 	}
 
-	lifecycle.OnStop(func(ctx context.Context) error {
+	lifecycle.OnStopFirst(func(ctx context.Context) error {
 		s.SetUnhealthy("lifecycle", "Service is shutting down")
 		return nil
 	})