HOME 2 years ago
parent
commit
7b469f3f57
3 changed files with 20 additions and 10 deletions
  1. 18 8
      VCommon.Logging/FileLogger.cs
  2. 1 1
      VCommon.Logging/VJsonFileLogger.cs
  3. 1 1
      VCommon.PubSub/Publisher.cs

+ 18 - 8
VCommon.Logging/FileLogger.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -107,20 +108,29 @@ namespace VCommon.Logging
         {
             lock (this)
             {
-                CleanOldFiles();
+                try
+                {
+                    CleanOldFiles();
 
-                if (!_rollers.TryGetValue(level, out var roller)) roller = _rollers[level] = new FileRoller(this, level);
+                    if (!_rollers.TryGetValue(level, out var roller)) roller = _rollers[level] = new FileRoller(this, level);
 
-                var today = DateTime.Now;
-                var formatted = FormatMessage(today, level, summary, moreInfo);
+                    var today = DateTime.Now;
+                    var formatted = FormatMessage(today, level, summary, moreInfo);
 
-                roller.WriteLine(today, formatted);
-                _allRoller?.WriteLine(today, formatted);
+                    roller.WriteLine(today, formatted);
+                    _allRoller?.WriteLine(today, formatted);
 
-                if (LogToConsole)
+                    if (LogToConsole)
+                    {
+                        Console.WriteLine(formatted);
+                    }
+                }
+                catch (Exception e)
                 {
-                    Console.WriteLine(formatted);
+                    System.Diagnostics.Debug.Print(e.ToString());
+                    System.Diagnostics.Debug.Print(summary);
                 }
+
             }
         }
 

+ 1 - 1
VCommon.Logging/VJsonFileLogger.cs

@@ -38,7 +38,7 @@ namespace VCommon.Logging
             var currentThread = Thread.CurrentThread;
 
             return $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} {level} {currentThread.Name ?? "Unamed"}({currentThread.ManagedThreadId})"
-                   + $"{Environment.NewLine}{summary.Replace("\r", "").Replace("\n", "")}"
+                   + $"{Environment.NewLine}{summary?.Replace("\r", "").Replace("\n", "")}"
                    + $"{Environment.NewLine}{json}"
                    + Environment.NewLine;
         }

+ 1 - 1
VCommon.PubSub/Publisher.cs

@@ -10,7 +10,7 @@ namespace VCommon.PubSub
 
         protected void Publish(string message)
         {
-            Logger.Trace($"{nameof(PubSub)}:{nameof(Publish)}", new { ChannelName, message });
+            Logger.Trace($"{nameof(PubSub)}:{nameof(Publish)}", new { ChannelName, Content = message });
             Conn.GetSubscriber().Publish(ChannelName, message);
         }
     }