chore: added missing return statement when subscription cancled (dyme…

…nsionxyz#491)
candles0585 · Oct 1, 2023 · 9e596df · 9e596df
1 parent 17e8622
commit 9e596df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/block/synctarget.go b/block/synctarget.go
@@ -41,7 +41,8 @@ func (m *Manager) SyncTargetLoop(ctx context.Context) {
 			// TODO(omritoptix): Check if we are the aggregator
 			m.batchInProcess.Store(false)
 		case <-subscription.Cancelled():
-			m.logger.Info("Subscription canceled")
+			m.logger.Info("syncTargetLoop subscription canceled")
+			return
 		}
 	}
 }

diff --git a/settlement/base.go b/settlement/base.go
@@ -179,7 +179,7 @@ func (b *BaseLayerClient) stateUpdatesHandler(ready chan bool) {
 			utils.SubmitEventOrPanic(b.ctx, b.pubsub, newBatchEventData,
 				map[string][]string{EventTypeKey: {EventNewBatchAccepted}})
 		case <-subscription.Cancelled():
-			b.logger.Info("subscription canceled")
+			b.logger.Info("stateUpdatesHandler subscription canceled")
 			return
 		case <-b.ctx.Done():
 			b.logger.Info("Context done. Exiting state update handler")

diff --git a/utils/events.go b/utils/events.go
@@ -22,7 +22,8 @@ func SubscribeAndHandleEvents(ctx context.Context, pubsubServer *pubsub.Server,
 		case event := <-subscription.Out():
 			callback(event)
 		case <-subscription.Cancelled():
-			logger.Info("Subscription canceled")
+			logger.Info(clientID + " subscription canceled")
+			return
 		}
 	}
 }