fix(runtime-watcher): make Stop() indempotent

topfreegames · Feb 27, 2025 · 2bfeb98 · 2bfeb98
1 parent 4ced805
commit 2bfeb98
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/internal/core/worker/runtimewatcher/runtime_watcher_worker.go b/internal/core/worker/runtimewatcher/runtime_watcher_worker.go
@@ -89,6 +89,7 @@ func (w *runtimeWatcherWorker) spawnUpdateRoomWatchers(resultChan chan game_room
 				case event, ok := <-resultChan:
 					if !ok {
 						w.logger.Warn("resultChan closed, finishing worker goroutine")
+						w.Stop(w.ctx)
 						return
 					}
 					err := w.processEvent(w.ctx, event)
@@ -115,7 +116,7 @@ func (w *runtimeWatcherWorker) mitigateDisruptions() error {
 			zap.String("scheduler", w.scheduler.Name),
 			zap.Error(err),
 		)
-		return nil
+		return err
 	}
 	mitigationQuota := 0
 	if totalRoomsAmount >= MinRoomsToApplyDisruption {
@@ -126,7 +127,7 @@ func (w *runtimeWatcherWorker) mitigateDisruptions() error {
 				zap.String("scheduler", w.scheduler.Name),
 				zap.Error(err),
 			)
-			return nil
+			return err
 		}
 	}
 	err = w.runtime.MitigateDisruption(w.ctx, w.scheduler, mitigationQuota, w.config.DisruptionSafetyPercentage)
@@ -196,9 +197,13 @@ func (w *runtimeWatcherWorker) Start(ctx context.Context) error {
 }
 
 func (w *runtimeWatcherWorker) Stop(_ context.Context) {
-	w.logger.Info("stopping runtime watcher", zap.String("scheduler", w.scheduler.Name))
 	if w.cancelFunc != nil {
-		w.cancelFunc()
+		w.logger.Info("stopping runtime watcher", zap.String("scheduler", w.scheduler.Name))
+		// To make this function idempotent, we need to set the cancelFunc to nil
+		// before calling it.
+		cancelFunc := w.cancelFunc
+		w.cancelFunc = nil
+		cancelFunc()
 	}
 }