修复了日志器的代理问题

zsh2401 · Aug 19, 2020 · 8591acf · 8591acf
1 parent 2408a31
commit 8591acf
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 27 deletions.
diff --git a/src/AutumnBox.Logging.Shared/Internal/LoggerImpl.cs b/src/AutumnBox.Logging.Shared/Internal/LoggerImpl.cs
@@ -13,12 +13,12 @@ public LoggerImpl(string categoryName)
         protected LoggerImpl() { }
         public void Log(string level, object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(level, CategoryName, message));
+            LoggingManager.Proxy.Log(new Log(level, CategoryName, message));
         }
 
         public void Log(string level, object message, Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(level, CategoryName, message, e));
+            LoggingManager.Proxy.Log(new Log(level, CategoryName, message, e));
         }
     }
 }
diff --git a/src/AutumnBox.Logging.Shared/Management/LoggingManager.cs b/src/AutumnBox.Logging.Shared/Management/LoggingManager.cs
@@ -11,26 +11,31 @@ namespace AutumnBox.Logging.Management
     public static class LoggingManager
     {
         /// <summary>
-        /// 日志站
+        /// 核心的日志处理器
         /// </summary>
         public static ICoreLogger CoreLogger
         {
-            get => proxy.InnerLogger; set
+            get => Proxy.InnerLogger;
+            set
             {
                 if (value is null)
                 {
                     throw new ArgumentNullException(nameof(value));
                 }
-                proxy.InnerLogger = value;
+                Proxy.InnerLogger = value;
             }
         }
 
+        /// <summary>
+        /// 代理日志器，额外提供了记录日志的相关功能
+        /// </summary>
+        internal static CoreLoggerProxy Proxy { get; } = new CoreLoggerProxy();
+
         /// <summary>
         /// 已记录的日志
         /// </summary>
-        public static ILogsCollection Logs => proxy.Logs;
+        public static ILogsCollection Logs => Proxy.Logs;
 
-        static readonly CoreLoggerProxy proxy = new CoreLoggerProxy();
 
         /// <summary>
         /// 使用某个日志器
@@ -47,14 +52,14 @@ public static void Use(ICoreLogger coreLogger)
         /// </summary>
         public static void Free()
         {
-            proxy.Logs.Clear();
-            proxy.Dispose();
+            Proxy.Logs.Clear();
+            Proxy.Dispose();
         }
 
         /// <summary>
         /// 核心日志器代理
         /// </summary>
-        private class CoreLoggerProxy : ICoreLogger
+        internal class CoreLoggerProxy : ICoreLogger
         {
             public class LogsCollection : ObservableCollection<ILog>, ILogsCollection { }
             public LogsCollection Logs { get; private set; }

diff --git a/src/AutumnBox.Logging.Shared/SLogger.Generic.cs b/src/AutumnBox.Logging.Shared/SLogger.Generic.cs
@@ -19,7 +19,7 @@ public static class SLogger<TCategory>
         /// <param name="message"></param>
         public static void Debug(object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Debug), Category, message));
+            LoggingManager.Proxy.Log(new Log(nameof(Debug), Category, message));
         }
 
         /// <summary>
@@ -29,7 +29,7 @@ public static void Debug(object message)
         /// <param name="e"></param>
         public static void Debug(object message, Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Debug), Category, message, e));
+            LoggingManager.Proxy.Log(new Log(nameof(Debug), Category, message, e));
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ public static void Debug(object message, Exception e)
         [Conditional("DEBUG")]
         public static void CDebug(object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(CDebug), Category, message));
+            LoggingManager.Proxy.Log(new Log(nameof(CDebug), Category, message));
         }
         /// <summary>
         /// 写出一条带异常CDebug级别的日志信息,当你的程序集使用非DEBUG编译时,对此函数的调用会被忽略
@@ -48,7 +48,7 @@ public static void CDebug(object message)
         [Conditional("DEBUG")]
         public static void CDebug(object message, Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(CDebug), Category, message, e));
+            LoggingManager.Proxy.Log(new Log(nameof(CDebug), Category, message, e));
         }
 
         /// <summary>
@@ -57,7 +57,7 @@ public static void CDebug(object message, Exception e)
         /// <param name="e"></param>
         public static void Exception(Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Exception), Category, e));
+            LoggingManager.Proxy.Log(new Log(nameof(Exception), Category, e));
         }
 
         /// <summary>
@@ -66,7 +66,7 @@ public static void Exception(Exception e)
         /// <param name="message"></param>
         public static void Info(object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Info), Category, message));
+            LoggingManager.Proxy.Log(new Log(nameof(Info), Category, message));
         }
 
         /// <summary>
@@ -75,7 +75,7 @@ public static void Info(object message)
         /// <param name="message"></param>
         public static void Warn(object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Warn), Category, message));
+            LoggingManager.Proxy.Log(new Log(nameof(Warn), Category, message));
         }
 
         /// <summary>
@@ -85,7 +85,7 @@ public static void Warn(object message)
         /// <param name="e"></param>
         public static void Warn(object message, Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Warn), Category, message, e));
+            LoggingManager.Proxy.Log(new Log(nameof(Warn), Category, message, e));
         }
     }
 }
diff --git a/src/AutumnBox.Logging.Shared/SLogger.cs b/src/AutumnBox.Logging.Shared/SLogger.cs
@@ -19,7 +19,7 @@ public static class SLogger
         /// <param name="message"></param>
         public static void Debug(object category, object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Debug), category, message));
+            LoggingManager.Proxy.Log(new Log(nameof(Debug), category, message));
         }
 
         /// <summary>
@@ -30,7 +30,7 @@ public static void Debug(object category, object message)
         /// <param name="e"></param>
         public static void Debug(object category, object message, Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Debug), category, message, e));
+            LoggingManager.Proxy.Log(new Log(nameof(Debug), category, message, e));
         }
         /// <summary>
         /// 写出一条CDebug级别的日志信息,当你的程序集使用非DEBUG编译时,对此函数的调用会被忽略
@@ -40,7 +40,7 @@ public static void Debug(object category, object message, Exception e)
         [Conditional("DEBUG")]
         public static void CDebug(object category, object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(CDebug), category, message));
+            LoggingManager.Proxy.Log(new Log(nameof(CDebug), category, message));
         }
 
         /// <summary>
@@ -51,7 +51,7 @@ public static void CDebug(object category, object message)
         [Conditional("DEBUG")]
         public static void CDebug(object category, object message, Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(CDebug), category, message, e));
+            LoggingManager.Proxy.Log(new Log(nameof(CDebug), category, message, e));
         }
 
         /// <summary>
@@ -61,7 +61,7 @@ public static void CDebug(object category, object message, Exception e)
         /// <param name="e"></param>
         public static void Exception(object category, Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Exception), category, e));
+            LoggingManager.Proxy.Log(new Log(nameof(Exception), category, e));
         }
 
         /// <summary>
@@ -71,7 +71,7 @@ public static void Exception(object category, Exception e)
         /// <param name="message"></param>
         public static void Info(object category, object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Info), category, message));
+            LoggingManager.Proxy.Log(new Log(nameof(Info), category, message));
         }
 
         /// <summary>
@@ -81,7 +81,7 @@ public static void Info(object category, object message)
         /// <param name="message"></param>
         public static void Warn(object category, object message)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Warn), category, message));
+            LoggingManager.Proxy.Log(new Log(nameof(Warn), category, message));
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public static void Warn(object category, object message)
         /// <param name="e"></param>
         public static void Warn(object category, object message, Exception e)
         {
-            LoggingManager.CoreLogger.Log(new Log(nameof(Warn), category, message, e));
+            LoggingManager.Proxy.Log(new Log(nameof(Warn), category, message, e));
         }
     }
 }
diff --git a/src/AutumnBox.OpenFramework.Shared/Management/ExtInfo/ExtensionInfoExtension.cs b/src/AutumnBox.OpenFramework.Shared/Management/ExtInfo/ExtensionInfoExtension.cs
@@ -189,7 +189,10 @@ public static bool IsRunnableCheck(this IExtensionInfo extInf, IDevice? currentD
                     {
                         SLogger.Warn(typeof(ExtensionInfoExtension).Name, $"There is no Runnable Prolicy defined for {extInf.Id}", e);
                     }
-                    SLogger.Warn(typeof(ExtensionInfoExtension).Name, $"Could not finish runnable check for {extInf.Id}", e);
+                    else
+                    {
+                        SLogger.Warn(typeof(ExtensionInfoExtension).Name, $"Could not finish runnable check for {extInf.Id}", e);
+                    }
                 }
                 catch
                 {