Address PR feedback: restore removed comment, add _isSubscribed pre-lock check in CleanupAsync

niemyjski · niemyjski · commit efb7d8a5e674 · 2026-04-15T09:23:52.000-05:00
diff --git a/src/Foundatio.Redis/Messaging/RedisMessageBus.cs b/src/Foundatio.Redis/Messaging/RedisMessageBus.cs
@@ -128,6 +128,7 @@ private async Task OnMessage(ChannelMessage channelMessage)
         }
         catch (Exception ex)
         {
+            // Catch any other unexpected exceptions for defensive purposes
             _logger.LogError(ex, "OnMessage({Channel}) Error in subscriber: {Message}", channelMessage.Channel, ex.Message);
         }
     }
@@ -165,6 +166,9 @@ await _subscriber.PublishAsync(_channel, data, CommandFlags.FireAndForget),
 
     protected override async Task CleanupAsync()
     {
+        if (!_isSubscribed)
+            return;
+
         using (await _lock.LockAsync().AnyContext())
         {
             if (_channelMessageQueue is not null)

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ private async Task OnMessage(ChannelMessage channelMessage)`
`128`	`128`	`}`
`129`	`129`	`catch (Exception ex)`
`130`	`130`	`{`
	`131`	`+ // Catch any other unexpected exceptions for defensive purposes`
`131`	`132`	`_logger.LogError(ex, "OnMessage({Channel}) Error in subscriber: {Message}", channelMessage.Channel, ex.Message);`
`132`	`133`	`}`
`133`	`134`	`}`
`@@ -165,6 +166,9 @@ await _subscriber.PublishAsync(_channel, data, CommandFlags.FireAndForget),`
`165`	`166`
`166`	`167`	`protected override async Task CleanupAsync()`
`167`	`168`	`{`
	`169`	`+ if (!_isSubscribed)`
	`170`	`+ return;`
	`171`	`+`
`168`	`172`	`using (await _lock.LockAsync().AnyContext())`
`169`	`173`	`{`
`170`	`174`	`if (_channelMessageQueue is not null)`