Implemented logging from DI

andresgutierrez · Oct 16, 2023 · e8f1ba5 · e8f1ba5
1 parent 9baf2fe
commit e8f1ba5
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 11 deletions.
diff --git a/Nixie.Tests/Actors/LoggingActor.cs b/Nixie.Tests/Actors/LoggingActor.cs
@@ -19,4 +19,3 @@ public async Task Receive(string message)
         context.Logger?.LogInformation("Message: {Message}", message);
     }
 }
-
diff --git a/Nixie.Tests/Actors/LoggingArgsActor.cs b/Nixie.Tests/Actors/LoggingArgsActor.cs
@@ -0,0 +1,22 @@
+
+using Microsoft.Extensions.Logging;
+
+namespace Nixie.Tests.Actors;
+
+public class LoggingArgsActor : IActor<string>
+{    
+    private readonly ILogger<TestLogging> logger;
+
+    public LoggingArgsActor(IActorContext<LoggingArgsActor, string> _, ILogger<TestLogging> logger)
+    {
+        this.logger = logger;
+    }
+
+    public async Task Receive(string message)
+    {
+        await Task.Yield();
+
+        logger.LogInformation("Message: {Message}", message);
+    }
+}
+
diff --git a/Nixie.Tests/TestLogging.cs b/Nixie.Tests/TestLogging.cs
@@ -1,6 +1,7 @@
 
 using Nixie.Tests.Actors;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Nixie.Tests;
 
@@ -31,11 +32,29 @@ public async Task TestAddLogging()
 
         Assert.IsAssignableFrom<LoggingActor>(actor.Runner.Actor);
 
-        actor.Send("message");
+        actor.Send("TestAddLogging");
 
         await asx.Wait();
+    }
+
+    [Fact]
+    public async Task TestAddLoggingArgs()
+    {
+        IServiceCollection services = new ServiceCollection();
+
+        services.AddSingleton(typeof(ILogger<TestLogging>), logger);
+
+        ServiceProvider serviceProvider = services.BuildServiceProvider();
+
+        using ActorSystem asx = new(serviceProvider);
+
+        IActorRef<LoggingArgsActor, string> actor = asx.Spawn<LoggingArgsActor, string>();
+
+        Assert.IsAssignableFrom<LoggingArgsActor>(actor.Runner.Actor);
+
+        actor.Send("TestAddLoggingArgs");
 
-        //Assert.Equal(5, ((LoggingActor)actor.Runner.Actor!).GetMessages());
+        await asx.Wait();        
     }
 }
 
diff --git a/Nixie/ActorRepository.cs b/Nixie/ActorRepository.cs
@@ -36,9 +36,10 @@ public ActorRepository(ActorSystem actorSystem, IServiceProvider? serviceProvide
     /// <summary>
     /// Check if any of the actors have pending messages
     /// </summary>
+    /// <param name="actorName"></param>
     /// <returns></returns>
-    public bool HasPendingMessages()
-    {
+    public bool HasPendingMessages(out string? actorName)
+    {        
         foreach (KeyValuePair<string, Lazy<(ActorRunner<TActor, TRequest> runner, ActorRef<TActor, TRequest> actorRef)>> actor in actors)
         {
             Lazy<(ActorRunner<TActor, TRequest> runner, ActorRef<TActor, TRequest> actorRef)> lazyValue = actor.Value;
@@ -48,18 +49,23 @@ public bool HasPendingMessages()
                 ActorRunner<TActor, TRequest> runner = lazyValue.Value.runner;
 
                 if (!runner.IsShutdown && !lazyValue.Value.runner.Inbox.IsEmpty)
+                {
+                    actorName = runner.Name;
                     return true;
+                }
             }
         }
 
+        actorName = null;
         return false;
     }
 
     /// <summary>
     /// Check if any of the actors are processing messages
     /// </summary>
+    /// <param name="actorName"></param>
     /// <returns></returns>
-    public bool IsProcessing()
+    public bool IsProcessing(out string? actorName)
     {
         foreach (KeyValuePair<string, Lazy<(ActorRunner<TActor, TRequest> runner, ActorRef<TActor, TRequest> actorRef)>> actor in actors)
         {
@@ -70,10 +76,14 @@ public bool IsProcessing()
                 ActorRunner<TActor, TRequest> runner = lazyValue.Value.runner;
 
                 if (!runner.IsShutdown && runner.IsProcessing)
+                {
+                    actorName = runner.Name;
                     return true;
+                }
             }
         }
 
+        actorName = null;
         return false;
     }
 

diff --git a/Nixie/ActorRepositoryReply.cs b/Nixie/ActorRepositoryReply.cs
@@ -38,7 +38,7 @@ public ActorRepository(ActorSystem actorSystem, IServiceProvider? serviceProvide
     /// Check if any of the actors have pending messages
     /// </summary>
     /// <returns></returns>
-    public bool HasPendingMessages()
+    public bool HasPendingMessages(out string? actorName)
     {
         foreach (KeyValuePair<string, Lazy<(ActorRunner<TActor, TRequest, TResponse> runner, ActorRef<TActor, TRequest, TResponse> actorRef)>> actor in actors)
         {
@@ -49,18 +49,22 @@ public bool HasPendingMessages()
                 ActorRunner<TActor, TRequest, TResponse> runner = lazyValue.Value.runner;
 
                 if (!runner.IsShutdown && !lazyValue.Value.runner.Inbox.IsEmpty)
+                {
+                    actorName = runner.Name;
                     return true;
+                }
             }
         }
 
+        actorName = null;
         return false;
     }
 
     /// <summary>
     /// Check if any of the actors are processing messages
     /// </summary>
     /// <returns></returns>
-    public bool IsProcessing()
+    public bool IsProcessing(out string? actorName)
     {
         foreach (KeyValuePair<string, Lazy<(ActorRunner<TActor, TRequest, TResponse> runner, ActorRef<TActor, TRequest, TResponse> actorRef)>> actor in actors)
         {
@@ -71,10 +75,14 @@ public bool IsProcessing()
                 ActorRunner<TActor, TRequest, TResponse> runner = lazyValue.Value.runner;
 
                 if (!runner.IsShutdown && runner.IsProcessing)
+                {
+                    actorName = runner.Name;
                     return true;
+                }
             }
         }
 
+        actorName = null;
         return false;
     }
 

diff --git a/Nixie/ActorSystem.cs b/Nixie/ActorSystem.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Nixie.Actors;
 using System.Collections.Concurrent;
+using System.Diagnostics;
 
 namespace Nixie;
 
@@ -330,6 +331,9 @@ public void StopAllTimers<TActor, TRequest>(IActorRef<TActor, TRequest> actorRef
     /// <returns></returns>
     public async Task Wait()
     {
+        Stopwatch stopWatch = new();
+        string? pendingActorName = null, processingName = null;
+
         while (true)
         {
             bool completed = true;
@@ -341,7 +345,7 @@ public async Task Wait()
                 if (!lazyRepository.IsValueCreated)
                     continue;
 
-                if (lazyRepository.Value.HasPendingMessages() || lazyRepository.Value.IsProcessing())
+                if (lazyRepository.Value.HasPendingMessages(out pendingActorName) || lazyRepository.Value.IsProcessing(out processingName))
                 {
                     await Task.Yield();
                     completed = false;
@@ -351,6 +355,12 @@ public async Task Wait()
 
             if (completed)
                 break;
+
+            if (stopWatch.ElapsedMilliseconds > 10000)
+            {
+                logger?.LogWarning("Timeout waiting for actor {PendingActorName}/{ProcessingName}", pendingActorName, processingName);
+                break;
+            }
         }
     }
 

diff --git a/Nixie/IActorRepositoryRunnable.cs b/Nixie/IActorRepositoryRunnable.cs
@@ -10,11 +10,11 @@ public interface IActorRepositoryRunnable
     /// Returns true if there are pending messages to process.
     /// </summary>
     /// <returns></returns>
-    public bool HasPendingMessages();
+    public bool HasPendingMessages(out string? actorName);
 
     /// <summary>
     /// Returns true if the repository is processing messages.
     /// </summary>
     /// <returns></returns>
-    public bool IsProcessing();
+    public bool IsProcessing(out string? actorName);
 }