From b3d8757afc3eb157996592feeddcb5004bc41a3b Mon Sep 17 00:00:00 2001
From: Timerix22 <timerix11@gmail.com>
Date: Thu, 17 Nov 2022 21:35:20 +0600
Subject: [PATCH] LogFormat

---
 DTLib.Logging/DTLib.Logging.csproj           |  2 +-
 DTLib.Logging/LogFormats/DefaultLogFormat.cs | 14 ++++++++++----
 DTLib.Logging/Microsoft/MyLoggerWrapper.cs   |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/DTLib.Logging/DTLib.Logging.csproj b/DTLib.Logging/DTLib.Logging.csproj
index 8805129..ff0927c 100644
--- a/DTLib.Logging/DTLib.Logging.csproj
+++ b/DTLib.Logging/DTLib.Logging.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     </ItemGroup>
     <ItemGroup>
         <Compile Remove="Ben.Demystifier\**" />
diff --git a/DTLib.Logging/LogFormats/DefaultLogFormat.cs b/DTLib.Logging/LogFormats/DefaultLogFormat.cs
index 144f637..21cf0d9 100644
--- a/DTLib.Logging/LogFormats/DefaultLogFormat.cs
+++ b/DTLib.Logging/LogFormats/DefaultLogFormat.cs
@@ -17,10 +17,16 @@ public class DefaultLogFormat : ILogFormat
     public string CreateMessage(string context, LogSeverity severity, object message)
     {
         var sb = new StringBuilder();
-        if (PrintTimeStamp) sb.Append('[').Append(DateTime.Now.ToString(MyTimeFormat.ForText)).Append(']');
-        if(PrintContext) sb.Append('[').Append(context).Append(']');
-        if(PrintSeverity) sb.Append('[').Append(severity.ToString()).Append(']');
-        if (sb.Length != 0) sb.Append(": ");
+        if (PrintTimeStamp) 
+            sb.Append('[').Append(DateTime.Now.ToString(MyTimeFormat.ForText)).Append(']');
+        if (PrintContext && PrintSeverity) 
+            sb.Append('[').Append(context).Append('/').Append(severity.ToString().Append(']'));
+        else if(PrintContext) 
+            sb.Append('[').Append(context).Append(']');
+        else if(PrintSeverity) 
+            sb.Append('[').Append(severity.ToString()).Append(']');
+        if (sb.Length != 0) 
+            sb.Append(": ");
         sb.Append(message.ToString());
         sb.Append('\n');
         return sb.ToString();
diff --git a/DTLib.Logging/Microsoft/MyLoggerWrapper.cs b/DTLib.Logging/Microsoft/MyLoggerWrapper.cs
index 1295d6d..251f96b 100644
--- a/DTLib.Logging/Microsoft/MyLoggerWrapper.cs
+++ b/DTLib.Logging/Microsoft/MyLoggerWrapper.cs
@@ -2,10 +2,10 @@ using Microsoft.Extensions.Logging;
 
 namespace DTLib.Logging.New.Microsoft;
 
-internal class MyLoggerWrapper<TCaller> : ILogger<TCaller>
+public class MyLoggerWrapper<TCaller> : global::Microsoft.Extensions.Logging.ILogger<TCaller>
 {
-    private ILogger _logger;
-    public MyLoggerWrapper(ILogger logger)=>
+    private DTLib.Logging.New.ILogger _logger;
+    public MyLoggerWrapper(DTLib.Logging.New.ILogger logger)=>
         _logger = logger;
 
     public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)