Merge pull request #40 from ojdev/dev

增加Json反序列化失败时的日志
ojdev · Nov 8, 2019 · 14a7174 · 14a7174
2 parents 17c834c + bbc53c1
commit 14a7174
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 63 deletions.
diff --git a/RabbitMQ.EventBus.AspNetCore.Simple/Controllers/MessageBodyHandle.cs b/RabbitMQ.EventBus.AspNetCore.Simple/Controllers/MessageBodyHandle.cs
@@ -5,32 +5,6 @@
 
 namespace RabbitMQ.EventBus.AspNetCore.Simple.Controllers
 {
-    public class MessageBodyHandle00 : IEventHandler<MessageBody>, IDisposable
-    {
-        private Guid id;
-        private readonly ILogger<MessageBodyHandle> _logger;
-
-        public MessageBodyHandle00(ILogger<MessageBodyHandle> logger)
-        {
-            id = Guid.NewGuid();
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-        public void Dispose()
-        {
-            Console.WriteLine("释放");
-        }
-
-        public Task Handle(EventHandlerArgs<MessageBody> args)
-        {
-            Console.WriteLine("==================================================");
-            Console.WriteLine(id + "=>" + typeof(MessageBody).Name);
-            Console.WriteLine(args.Event.Body);
-            Console.WriteLine(args.Original);
-            Console.WriteLine(args.Redelivered);
-            Console.WriteLine("==================================================");
-            return Task.CompletedTask;
-        }
-    }
     public class MessageBodyHandle : IEventHandler<MessageBody1>, IDisposable
     {
         private Guid id;
@@ -46,32 +20,6 @@ public void Dispose()
             Console.WriteLine("释放");
         }
 
-        public Task Handle(EventHandlerArgs<MessageBody1> args)
-        {
-            Console.WriteLine("==================================================");
-            Console.WriteLine(id + "=>" + typeof(MessageBody1).Name);
-            Console.WriteLine(args.Event.Body);
-            Console.WriteLine(args.Original);
-            Console.WriteLine(args.Redelivered);
-            Console.WriteLine("==================================================");
-            return Task.CompletedTask;
-        }
-    }
-    public class MessageBodyHandle111 : IEventHandler<MessageBody1>, IDisposable
-    {
-        private Guid id;
-        private readonly ILogger<MessageBodyHandle> _logger;
-
-        public MessageBodyHandle111(ILogger<MessageBodyHandle> logger)
-        {
-            id = Guid.NewGuid();
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-        public void Dispose()
-        {
-            Console.WriteLine("释放");
-        }
-
         public Task Handle(EventHandlerArgs<MessageBody1> args)
         {
             Console.WriteLine("==================================================");

diff --git a/RabbitMQ.EventBus.AspNetCore.Simple/Controllers/MessageBodyHandle00.cs b/RabbitMQ.EventBus.AspNetCore.Simple/Controllers/MessageBodyHandle00.cs
@@ -0,0 +1,34 @@
+using Microsoft.Extensions.Logging;
+using RabbitMQ.EventBus.AspNetCore.Events;
+using System;
+using System.Threading.Tasks;
+
+namespace RabbitMQ.EventBus.AspNetCore.Simple.Controllers
+{
+    public class MessageBodyHandle00 : IEventHandler<MessageBody>, IDisposable
+    {
+        private Guid id;
+        private readonly ILogger<MessageBodyHandle> _logger;
+
+        public MessageBodyHandle00(ILogger<MessageBodyHandle> logger)
+        {
+            id = Guid.NewGuid();
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+        public void Dispose()
+        {
+            Console.WriteLine("释放");
+        }
+
+        public Task Handle(EventHandlerArgs<MessageBody> args)
+        {
+            Console.WriteLine("==================================================");
+            Console.WriteLine(id + "=>" + typeof(MessageBody).Name);
+            Console.WriteLine(args.Event.Body);
+            Console.WriteLine(args.Original);
+            Console.WriteLine(args.Redelivered);
+            Console.WriteLine("==================================================");
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/RabbitMQ.EventBus.AspNetCore.Simple/Controllers/MessageBodyHandle111.cs b/RabbitMQ.EventBus.AspNetCore.Simple/Controllers/MessageBodyHandle111.cs
@@ -0,0 +1,34 @@
+using Microsoft.Extensions.Logging;
+using RabbitMQ.EventBus.AspNetCore.Events;
+using System;
+using System.Threading.Tasks;
+
+namespace RabbitMQ.EventBus.AspNetCore.Simple.Controllers
+{
+    public class MessageBodyHandle111 : IEventHandler<MessageBody1>
+    {
+        private Guid id;
+        private readonly ILogger<MessageBodyHandle> _logger;
+
+        public MessageBodyHandle111(ILogger<MessageBodyHandle> logger)
+        {
+            id = Guid.NewGuid();
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+        public void Dispose()
+        {
+            Console.WriteLine("释放");
+        }
+
+        public Task Handle(EventHandlerArgs<MessageBody1> args)
+        {
+            Console.WriteLine("==================================================");
+            Console.WriteLine(id + "=>" + typeof(MessageBody1).Name);
+            Console.WriteLine(args.Event.Body);
+            Console.WriteLine(args.Original);
+            Console.WriteLine(args.Redelivered);
+            Console.WriteLine("==================================================");
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/RabbitMQ.EventBus.AspNetCore/Configurations/RabbitMQEventBusConnectionConfiguration.cs b/src/RabbitMQ.EventBus.AspNetCore/Configurations/RabbitMQEventBusConnectionConfiguration.cs
@@ -33,7 +33,7 @@ public sealed class RabbitMQEventBusConnectionConfiguration
         /// </summary>
         public LogLevel Level { get; set; }
         /// <summary>
-        /// 队列名前缀（默认交换机名）
+        /// 队列名前缀（默认ClientProvidedName）
         /// </summary>
         public QueuePrefixType Prefix { get; set; }
         /// <summary>

diff --git a/src/RabbitMQ.EventBus.AspNetCore/DefaultRabbitMQEventBus.cs b/src/RabbitMQ.EventBus.AspNetCore/DefaultRabbitMQEventBus.cs
@@ -78,7 +78,7 @@ public void Subscribe(Type eventType, string type = ExchangeType.Topic)
                 {
                     string queue = attr.Queue ?? (_persistentConnection.Configuration.Prefix == QueuePrefixType.ExchangeName
                         ? $"{ attr.Exchange }.{ eventType.Name }"
-                        : $"{_persistentConnection.Configuration.ClientProvidedName}.{ eventType.Name }");//.{DateTimeOffset.Now.ToUnixTimeMilliseconds()}
+                        : $"{_persistentConnection.Configuration.ClientProvidedName}.{ eventType.Name }");
                     if (!_persistentConnection.IsConnected)
                     {
                         _persistentConnection.TryConnect();
@@ -92,9 +92,8 @@ public void Subscribe(Type eventType, string type = ExchangeType.Topic)
                     }
                     catch
                     {
-
                         channel = _persistentConnection.ExchangeDeclare(exchange: attr.Exchange, type: type);
-                        channel.QueueDeclare(queue: queue,//_persistentConnection.Configuration.ClientProvidedName
+                        channel.QueueDeclare(queue: queue,
                                              durable: true,
                                              exclusive: false,
                                              autoDelete: false,
@@ -152,6 +151,7 @@ private async Task ProcessEvent(string body, Type eventType, BasicDeliverEventAr
                 foreach (Type eventHandleType in typeof(IEventHandler<>).GetMakeGenericType(eventType))
                 {
                     object eventHandler = scope.ServiceProvider.GetRequiredService(eventHandleType);
+                    object logger = scope.ServiceProvider.GetRequiredService(typeof(ILogger<>).MakeGenericType(eventType));
                     if (eventHandler == null)
                     {
                         throw new InvalidOperationException(eventHandleType.Name);
@@ -160,7 +160,7 @@ private async Task ProcessEvent(string body, Type eventType, BasicDeliverEventAr
                     await (Task)concreteType.GetMethod(nameof(IEventHandler<IEvent>.Handle)).Invoke(
                         eventHandler,
                         new object[] {
-                         Activator.CreateInstance(typeof(EventHandlerArgs<>).MakeGenericType(eventType), new object[] { body, args.Redelivered, args.Exchange, args.RoutingKey })
+                         Activator.CreateInstance(typeof(EventHandlerArgs<>).MakeGenericType(eventType), new object[] { body, args.Redelivered, args.Exchange, args.RoutingKey, logger })
                         });
                 }
             }

diff --git a/src/RabbitMQ.EventBus.AspNetCore/Events/EventHandlerArgs.cs b/src/RabbitMQ.EventBus.AspNetCore/Events/EventHandlerArgs.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.ComponentModel;
 using System.Text.Json;
 
@@ -9,6 +10,7 @@ namespace RabbitMQ.EventBus.AspNetCore.Events
     /// </summary>
     public class EventHandlerArgs<TEvent>
     {
+        private readonly ILogger<TEvent> _logger;
         /// <summary>
         /// 原始消息
         /// </summary>
@@ -32,12 +34,14 @@ public class EventHandlerArgs<TEvent>
         /// <param name="redelivered"></param>
         /// <param name="exchange"></param>
         /// <param name="routingKey"></param>
-        public EventHandlerArgs(string original, bool redelivered, string exchange, string routingKey)
+        /// <param name="logger"></param>
+        public EventHandlerArgs(string original, bool redelivered, string exchange, string routingKey, ILogger<TEvent> logger = null)
         {
             Original = original;
             Redelivered = redelivered;
             Exchange = exchange;
             RoutingKey = routingKey;
+            _logger = logger;
         }
         private TEvent _event;
         /// <summary>
@@ -51,7 +55,6 @@ public TEvent Event
                 {
                     try
                     {
-
                         _event = JsonSerializer.Deserialize<TEvent>(Original);
                     }
                     catch
@@ -62,6 +65,7 @@ public TEvent Event
                         }
                         catch (Exception ex)
                         {
+                            _logger.LogError(new EventId(ex.HResult), ex, $"content {Original} deserialize type {typeof(TEvent).Name} error {ex.Message}");
                             throw ex;
                         }
                     }

diff --git a/src/RabbitMQ.EventBus.AspNetCore/Events/IEventHandler.cs b/src/RabbitMQ.EventBus.AspNetCore/Events/IEventHandler.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 
 namespace RabbitMQ.EventBus.AspNetCore.Events
 {

diff --git a/src/RabbitMQ.EventBus.AspNetCore/Extensions/ServiceCollectionExtensions.cs b/src/RabbitMQ.EventBus.AspNetCore/Extensions/ServiceCollectionExtensions.cs
@@ -64,7 +64,6 @@ public static void RabbitMQEventBusAutoSubscribe(this IApplicationBuilder app)
                     var handlesAny = typeof(IEventHandler<>).GetMakeGenericType(mType);
                     if (handlesAny.Any())
                     {
-
                         logger.LogInformation($"{mType.Name}\t=>\t{string.Join("、", handlesAny)}");
                         eventBus.Subscribe(mType);
                     }

diff --git a/src/RabbitMQ.EventBus.AspNetCore/Modules/EventBusArgs.cs b/src/RabbitMQ.EventBus.AspNetCore/Modules/EventBusArgs.cs
@@ -48,7 +48,7 @@ public class EventBusArgs
         /// <param name="clientProvidedName">客户端</param>
         /// <param name="message">消息</param>
         /// <param name="success">结果</param>
-        public EventBusArgs(string endPoint, string exchange, string queue, string routingKey, string exchangeType, string clientProvidedName, string message,bool success)
+        public EventBusArgs(string endPoint, string exchange, string queue, string routingKey, string exchangeType, string clientProvidedName, string message, bool success)
         {
             Endpoint = endPoint;
             Exchange = exchange;