Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions src/StackExchange.Redis/Maintenance/AzureMaintenanceEvent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,32 @@ internal static async Task AddListenerAsync(ConnectionMultiplexer multiplexer, A
try
{
var sub = multiplexer.GetSubscriber();
if (sub == null)
// ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
if (sub is null)
{
log?.Invoke("Failed to GetSubscriber for AzureRedisEvents");
return;
}

await sub.SubscribeAsync(RedisChannel.Literal(PubSubChannelName), async (_, message) =>
await sub.SubscribeAsync(RedisChannel.Literal(PubSubChannelName), (_, message) =>
{
var newMessage = new AzureMaintenanceEvent(message!);
newMessage.NotifyMultiplexer(multiplexer);
try
{
var newMessage = new AzureMaintenanceEvent(message!);
newMessage.NotifyMultiplexer(multiplexer);

switch (newMessage.NotificationType)
switch (newMessage.NotificationType)
{
case AzureNotificationType.NodeMaintenanceEnded:
case AzureNotificationType.NodeMaintenanceFailoverComplete:
case AzureNotificationType.NodeMaintenanceScaleComplete:
multiplexer.ReconfigureAsync($"Azure Event: {newMessage.NotificationType.ToString()}").RedisFireAndForget();
break;
}
}
catch (Exception e)
{
case AzureNotificationType.NodeMaintenanceEnded:
case AzureNotificationType.NodeMaintenanceFailoverComplete:
case AzureNotificationType.NodeMaintenanceScaleComplete:
await multiplexer.ReconfigureAsync($"Azure Event: {newMessage.NotificationType}").ForAwait();
break;
log?.Invoke($"Encountered exception: {e}");
}
}).ForAwait();
}
Expand Down
9 changes: 8 additions & 1 deletion src/StackExchange.Redis/RedisSubscriber.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,14 @@ internal long EnsureSubscriptions(CommandFlags flags = CommandFlags.None)
var subscriber = DefaultSubscriber;
foreach (var pair in subscriptions)
{
count += pair.Value.EnsureSubscribedToServer(subscriber, pair.Key, flags, true);
try
{
count += pair.Value.EnsureSubscribedToServer(subscriber, pair.Key, flags, true);
}
catch (Exception ex)
{
OnInternalError(ex);
}
}
return count;
}
Expand Down
Loading