ObserverManager: nits

dotnet · Jun 2, 2023 · 6cdaf8f · 6cdaf8f
1 parent bcf87d2
commit 6cdaf8f
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/src/Orleans.Core/Utils/ObserverManager.cs b/src/Orleans.Core/Utils/ObserverManager.cs
@@ -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.
@@ -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.
@@ -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>
@@ -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);
                     }
                 }
             }
@@ -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);
                     }
                 }
             }