From f846b7bdbf908ca23e580fbea3d81025863de25e Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Sun, 29 Jan 2023 20:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Extensions/LoggerExtensions.cs | 57 ++++++++++++++----------------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/Extensions/LoggerExtensions.cs b/src/Extensions/LoggerExtensions.cs
index 317d2ee..c323e99 100644
--- a/src/Extensions/LoggerExtensions.cs
+++ b/src/Extensions/LoggerExtensions.cs
@@ -8,27 +8,27 @@ namespace NSExt.Extensions;
 public static class LoggerExtensions
 {
     private const string _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER
-        = "{Message} <s:{ThreadId}#{CallerName}@{CallerFilePath}:{CallerLineNumber}>";
+        = "{Message} <s:{CallerName}@{CallerFilePath}:{CallerLineNumber}>";
 
-    private static readonly Action<ILogger, string, string, string, string, string, Exception> _logDebug
-        = LoggerMessage.Define<string, string, string, string, string>(LogLevel.Debug, default
-                                                                     , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
+    private static readonly Action<ILogger, string, string, string, string, Exception> _logDebug
+        = LoggerMessage.Define<string, string, string, string>(LogLevel.Debug, default
+                                                             , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
 
-    private static readonly Action<ILogger, string, string, string, string, string, Exception> _logError
-        = LoggerMessage.Define<string, string, string, string, string>(LogLevel.Error, default
-                                                                     , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
+    private static readonly Action<ILogger, string, string, string, string, Exception> _logError
+        = LoggerMessage.Define<string, string, string, string>(LogLevel.Error, default
+                                                             , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
 
-    private static readonly Action<ILogger, string, string, string, string, string, Exception> _logFatal
-        = LoggerMessage.Define<string, string, string, string, string>(LogLevel.Critical, default
-                                                                     , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
+    private static readonly Action<ILogger, string, string, string, string, Exception> _logFatal
+        = LoggerMessage.Define<string, string, string, string>(LogLevel.Critical, default
+                                                             , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
 
-    private static readonly Action<ILogger, string, string, string, string, string, Exception> _logInfo
-        = LoggerMessage.Define<string, string, string, string, string>(LogLevel.Information, default
-                                                                     , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
+    private static readonly Action<ILogger, string, string, string, string, Exception> _logInfo
+        = LoggerMessage.Define<string, string, string, string>(LogLevel.Information, default
+                                                             , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
 
-    private static readonly Action<ILogger, string, string, string, string, string, Exception> _logWarn
-        = LoggerMessage.Define<string, string, string, string, string>(LogLevel.Warning, default
-                                                                     , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
+    private static readonly Action<ILogger, string, string, string, string, Exception> _logWarn
+        = LoggerMessage.Define<string, string, string, string>(LogLevel.Warning, default
+                                                             , _MESSAGE_S_THREADID_CALLERNAME_CALLERFILEPATH_CALLERLINENUMBER);
 
     /// <summary>
     ///     Debug
@@ -36,9 +36,8 @@ public static class LoggerExtensions
     public static void Debug(this             ILogger me, object message, [CallerMemberName] string callerName = null
                            , [CallerFilePath] string callerFilePath = null, [CallerLineNumber] int callerLineNumber = 0)
     {
-        _logDebug(me, message.ToString(), Environment.CurrentManagedThreadId.ToString(CultureInfo.InvariantCulture)
-                , callerName, Path.GetFileName(callerFilePath), callerLineNumber.ToString(CultureInfo.InvariantCulture)
-                , null);
+        _logDebug(me, message.ToString(), callerName, Path.GetFileName(callerFilePath)
+            ,         callerLineNumber.ToString(CultureInfo.InvariantCulture), null);
     }
 
     /// <summary>
@@ -47,9 +46,8 @@ public static class LoggerExtensions
     public static void Error(this             ILogger me, object message, [CallerMemberName] string callerName = null
                            , [CallerFilePath] string callerFilePath = null, [CallerLineNumber] int callerLineNumber = 0)
     {
-        _logError(me, message.ToString(), Environment.CurrentManagedThreadId.ToString(CultureInfo.InvariantCulture)
-                , callerName, Path.GetFileName(callerFilePath), callerLineNumber.ToString(CultureInfo.InvariantCulture)
-                , null);
+        _logError(me, message.ToString(), callerName, Path.GetFileName(callerFilePath)
+            ,         callerLineNumber.ToString(CultureInfo.InvariantCulture), null);
     }
 
     /// <summary>
@@ -59,9 +57,8 @@ public static class LoggerExtensions
                            , [CallerMemberName] string  callerName = null, [CallerFilePath] string callerFilePath = null
                            , [CallerLineNumber] int     callerLineNumber = 0)
     {
-        _logFatal(me, message.ToString(), Environment.CurrentManagedThreadId.ToString(CultureInfo.InvariantCulture)
-                , callerName, Path.GetFileName(callerFilePath), callerLineNumber.ToString(CultureInfo.InvariantCulture)
-                , ex);
+        _logFatal(me, message.ToString(), callerName, Path.GetFileName(callerFilePath)
+            ,         callerLineNumber.ToString(CultureInfo.InvariantCulture), ex);
     }
 
     /// <summary>
@@ -70,9 +67,8 @@ public static class LoggerExtensions
     public static void Info(this             ILogger me, object message, [CallerMemberName] string callerName = null
                           , [CallerFilePath] string  callerFilePath = null, [CallerLineNumber] int callerLineNumber = 0)
     {
-        _logInfo(me, message.ToString(), Environment.CurrentManagedThreadId.ToString(CultureInfo.InvariantCulture)
-               , callerName, Path.GetFileName(callerFilePath), callerLineNumber.ToString(CultureInfo.InvariantCulture)
-               , null);
+        _logInfo(me, message.ToString(), callerName, Path.GetFileName(callerFilePath)
+           ,         callerLineNumber.ToString(CultureInfo.InvariantCulture), null);
     }
 
     /// <summary>
@@ -81,8 +77,7 @@ public static class LoggerExtensions
     public static void Warn(this             ILogger me, object message, [CallerMemberName] string callerName = null
                           , [CallerFilePath] string  callerFilePath = null, [CallerLineNumber] int callerLineNumber = 0)
     {
-        _logWarn(me, message.ToString(), Environment.CurrentManagedThreadId.ToString(CultureInfo.InvariantCulture)
-               , callerName, Path.GetFileName(callerFilePath), callerLineNumber.ToString(CultureInfo.InvariantCulture)
-               , null);
+        _logWarn(me, message.ToString(), callerName, Path.GetFileName(callerFilePath)
+           ,         callerLineNumber.ToString(CultureInfo.InvariantCulture), null);
     }
 }
\ No newline at end of file