Added more metadata to console logging if not a console app (#1319)

* Added more metadata to console logging if not a console app * Logs with [] around timestamp
SubnauticaNitrox · Dec 13, 2020 · 9834472 · 9834472
1 parent 018dd93
commit 9834472
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/NitroxModel/Logger/Log.cs b/NitroxModel/Logger/Log.cs
@@ -23,7 +23,7 @@ public static string PlayerName
             set => SetPlayerName(value);
         }
 
-        public static void Setup(bool asyncConsoleWriter = false, InGameLogger inGameLogger = null)
+        public static void Setup(bool asyncConsoleWriter = false, InGameLogger inGameLogger = null, bool isConsoleApp = false)
         {
             if (logger != null)
             {
@@ -33,7 +33,12 @@ public static void Setup(bool asyncConsoleWriter = false, InGameLogger inGameLog
                      .MinimumLevel.Debug()
                      .WriteTo.Logger(cnf =>
                      {
-                         string consoleTemplate = "{Timestamp:HH:mm:ss.fff} {Message}{NewLine}{Exception}";
+                         string consoleTemplate = isConsoleApp switch
+                         {
+                             false => $"[{{Timestamp:HH:mm:ss.fff}}] [{GetLoggerName()}{{{nameof(PlayerName)}}}][{{Level:u3}}] {{Message}}{{NewLine}}{{Exception}}",
+                             _ => "[{Timestamp:HH:mm:ss.fff}] {Message}{NewLine}{Exception}"
+                         };
+
                          if (asyncConsoleWriter)
                          {
                              cnf.WriteTo.Async(a => a.ColoredConsole(outputTemplate: consoleTemplate));

diff --git a/NitroxServer-Subnautica/Program.cs b/NitroxServer-Subnautica/Program.cs
@@ -32,7 +32,7 @@ public class Program
         private static async Task Main(string[] args)
         {
             // The thread that writers to console is paused while selecting text in console. So console writer needs to be async.
-            Log.Setup(asyncConsoleWriter: true);
+            Log.Setup(asyncConsoleWriter: true, isConsoleApp: true);
             AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledException;
 
             ConfigureCultureInfo();