More logging

shinyorg · Sep 28, 2024 · 08c547e · 08c547e
1 parent 8fa0c52
commit 08c547e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 21 deletions.
diff --git a/src/Shiny.Mediator/Impl/DefaultEventPublisher.cs b/src/Shiny.Mediator/Impl/DefaultEventPublisher.cs
@@ -4,9 +4,9 @@
 
 namespace Shiny.Mediator.Impl;
 
+
 public class DefaultEventPublisher(
     IServiceProvider services, 
-    ILogger<IEventPublisher> logger,
     IEnumerable<IEventCollector> collectors
 ) : IEventPublisher
 {
@@ -34,6 +34,7 @@ public async Task Publish<TEvent>(
         if (handlers.Count == 0)
             return;
 
+        var logger = services.GetRequiredService<ILogger<TEvent>>();
         var middlewares = scope.ServiceProvider.GetServices<IEventMiddleware<TEvent>>().ToList();
         var tasks = handlers
             .Select(x => Execute(@event, x, logger, middlewares, cancellationToken))
@@ -56,17 +57,16 @@ public IDisposable Subscribe<TEvent>(Func<TEvent, CancellationToken, Task> actio
     static async Task Execute<TEvent>(
         TEvent @event,
         IEventHandler<TEvent> eventHandler, 
-        ILogger<IEventPublisher> logger,
+        ILogger logger,
         IEnumerable<IEventMiddleware<TEvent>> middlewares,
         CancellationToken cancellationToken
     ) where TEvent : IEvent
     {
         var handlerDelegate = new EventHandlerDelegate(() =>
         {
             logger.LogDebug(
-                "Executing Event Handler {HandlerType} for {EventType}", 
-                eventHandler.GetType().FullName,
-                @event.GetType().FullName
+                "Executing Event Handler {HandlerType}", 
+                eventHandler.GetType().FullName
             );
             return eventHandler.Handle(@event, cancellationToken);
         });

diff --git a/src/Shiny.Mediator/Impl/RequestExecutor.cs b/src/Shiny.Mediator/Impl/RequestExecutor.cs
@@ -23,9 +23,8 @@ CancellationToken cancellationToken
                 (next, middleware) => () =>
                 {
                     logger.LogDebug(
-                        "Executing request middleware {MiddlewareType} for {RequestType}",
-                        middleware.GetType().FullName,
-                        request.GetType().FullName
+                        "Executing request middleware {MiddlewareType}",
+                        middleware.GetType().FullName
                     );
 
                     return middleware.Process(

diff --git a/src/Shiny.Mediator/Impl/RequestVoidWrapper.cs b/src/Shiny.Mediator/Impl/RequestVoidWrapper.cs
@@ -16,9 +16,8 @@ public async Task Handle(IServiceProvider services, TRequest request, Cancellati
         var handlerExec = new RequestHandlerDelegate<Unit>(async () =>
         {
             logger.LogDebug(
-                "Executing request handler {RequestHandlerType} for {RequestType}", 
-                requestHandler.GetType().FullName, 
-                request.GetType().FullName
+                "Executing request handler {RequestHandlerType}", 
+                requestHandler.GetType().FullName 
             );
             await requestHandler.Handle(request, cancellationToken).ConfigureAwait(false);
             return Unit.Value;

diff --git a/src/Shiny.Mediator/Impl/RequestWrapper.cs b/src/Shiny.Mediator/Impl/RequestWrapper.cs
@@ -16,9 +16,8 @@ public async Task<TResult> Handle(IServiceProvider services, TRequest request, C
         var handlerExec = new RequestHandlerDelegate<TResult>(() =>
         {
             logger.LogDebug(
-                "Executing request handler {RequestHandlerType} for {RequestType}", 
-                requestHandler.GetType().FullName, 
-                request.GetType().FullName
+                "Executing request handler {RequestHandlerType}", 
+                requestHandler.GetType().FullName 
             );
             return requestHandler.Handle(request, cancellationToken);
         });

diff --git a/src/Shiny.Mediator/Impl/StreamRequestWrapper.cs b/src/Shiny.Mediator/Impl/StreamRequestWrapper.cs
@@ -16,25 +16,22 @@ public IAsyncEnumerable<TResult> Handle(IServiceProvider services, TRequest requ
         var handlerExec = new StreamRequestHandlerDelegate<TResult>(() =>
         {
             logger.LogDebug(
-                "Executing streaming request handler {RequestHandlerType} for {RequestType}",
-                requestHandler.GetType().FullName,
-                request.GetType().FullName
+                "Executing streaming request handler {RequestHandlerType}",
+                requestHandler.GetType().FullName
             );
             return requestHandler.Handle(request, cancellationToken);
         });
 
         var middlewares = services.GetServices<IStreamRequestMiddleware<TRequest, TResult>>();
-
         var enumerable = middlewares
             .Reverse()
             .Aggregate(
                 handlerExec,
                 (next, middleware) => () =>
                 {
                     logger.LogDebug(
-                        "Executing stream middleware {MiddlewareType} for {RequestType}",
-                        middleware.GetType().FullName,
-                        request.GetType().FullName
+                        "Executing stream middleware {MiddlewareType}",
+                        middleware.GetType().FullName
                     );
                     return middleware.Process(
                         request,

diff --git a/tests/Shiny.Mediator.Tests/OfflineAvailableMiddlewareTests.cs b/tests/Shiny.Mediator.Tests/OfflineAvailableMiddlewareTests.cs
@@ -24,6 +24,7 @@ public OfflineAvailableRequestMiddlewareTests()
         // this.config.AddConfiguration(new MemoryConfigurationProvider(new MemoryConfigurationSource().InitialData))
 
         this.middleware = new OfflineAvailableRequestMiddleware<OfflineRequest, long>(
+            null,
             this.connectivity, 
             this.storeMgr,
             null