Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ObserverManager: nits #8460

Merged
merged 1 commit into from Jun 5, 2023
Merged

ObserverManager: nits #8460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 8 additions & 11 deletions src/Orleans.Core/Utils/ObserverManager.cs
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ public ObserverManager(TimeSpan expiration, ILogger log) : base(expiration, log)
/// <typeparam name="TObserver">
/// The observer type.
/// </typeparam>
public class ObserverManager<TIdentity, TObserver> : IEnumerable<TObserver>
public class ObserverManager<TIdentity, TObserver> : IEnumerable<TObserver> where TIdentity : notnull
{
/// <summary>
/// The observers.
Expand Down Expand Up @@ -81,13 +81,7 @@ public ObserverManager(TimeSpan expiration, ILogger log)
/// <summary>
/// Gets a copy of the observers.
/// </summary>
public IDictionary<TIdentity, TObserver> Observers
{
get
{
return _observers.ToDictionary(_ => _.Key, _ => _.Value.Observer);
}
}
public IDictionary<TIdentity, TObserver> Observers => _observers.ToDictionary(_ => _.Key, _ => _.Value.Observer);

/// <summary>
/// Removes all observers.
Expand Down Expand Up @@ -136,8 +130,11 @@ public void Subscribe(TIdentity id, TObserver observer)
/// </param>
public void Unsubscribe(TIdentity id)
{
_log.LogDebug("Removed entry for {Id}. {Count} total observers after remove.", id, _observers.Count);
_observers.Remove(id, out _);
if (_log.IsEnabled(LogLevel.Debug))
{
_log.LogDebug("Removed entry for {Id}. {Count} total observers after remove.", id, _observers.Count);
}
}

/// <summary>
Expand Down Expand Up @@ -192,7 +189,7 @@ public async Task Notify(Func<TObserver, Task> notification, Func<TObserver, boo
_observers.Remove(observer, out _);
if (_log.IsEnabled(LogLevel.Debug))
{
_log.LogDebug("Removing defunct entry for {0}. {1} total observers after remove.", observer, _observers.Count);
_log.LogDebug("Removing defunct entry for {Id}. {Count} total observers after remove.", observer, _observers.Count);
}
}
}
Expand Down Expand Up @@ -247,7 +244,7 @@ public void Notify(Action<TObserver> notification, Func<TObserver, bool> predica
_observers.Remove(observer, out _);
if (_log.IsEnabled(LogLevel.Debug))
{
_log.LogDebug("Removing defunct entry for {Observer}. {Count} total observers after remove.", observer, _observers.Count);
_log.LogDebug("Removing defunct entry for {Id}. {Count} total observers after remove.", observer, _observers.Count);
}
}
}
Expand Down