Merge pull request #912 from colinin/fixed-serilog-loglevel-mapping

Fix the serilog log level mapping

aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/AbpLoggingSerilogElasticsearchMapperProfile.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using Serilog.Events;
 
 namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
 {
@@ -9,7 +10,21 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
             CreateMap<SerilogException, LogException>();
             CreateMap<SerilogField, LogField>()
                 .ForMember(log => log.Id, map => map.MapFrom(slog => slog.UniqueId.ToString()));
-            CreateMap<SerilogInfo, LogInfo>();
+            CreateMap<SerilogInfo, LogInfo>()
+                .ForMember(log => log.Level, map => map.MapFrom(slog => GetLogLevel(slog.Level)));
+        }
+
+        private static Microsoft.Extensions.Logging.LogLevel GetLogLevel(LogEventLevel logEventLevel)
+        {
+            return logEventLevel switch
+            {
+                LogEventLevel.Fatal => Microsoft.Extensions.Logging.LogLevel.Critical,
+                LogEventLevel.Error => Microsoft.Extensions.Logging.LogLevel.Error,
+                LogEventLevel.Warning => Microsoft.Extensions.Logging.LogLevel.Warning,
+                LogEventLevel.Information => Microsoft.Extensions.Logging.LogLevel.Information,
+                LogEventLevel.Debug => Microsoft.Extensions.Logging.LogLevel.Debug,
+                _ => Microsoft.Extensions.Logging.LogLevel.Trace,
+            };
         }
     }
 }

aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogInfo.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Serilog.Events;
 using Serilog.Formatting.Elasticsearch;
 using System;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
         public DateTime TimeStamp { get; set; }
 
         [Nest.PropertyName(ElasticsearchJsonFormatter.LevelPropertyName)]
-        public LogLevel Level { get; set; }
+        public LogEventLevel Level { get; set; }
 
         [Nest.PropertyName(ElasticsearchJsonFormatter.RenderedMessagePropertyName)]
         public string Message { get; set; }