chore: remove homebrew Intersect logging and replace with Serilog and…

… Microsoft ILogger
AscensionGameDev · Jan 20, 2025 · 971bcc7 · 971bcc7
1 parent 540033b
commit 971bcc7
Show file tree

Hide file tree

Showing 485 changed files with 1,507 additions and 3,614 deletions.
diff --git a/Examples/Intersect.Examples.Plugin.Client.Tests/ManifestTest.cs b/Examples/Intersect.Examples.Plugin.Client.Tests/ManifestTest.cs
@@ -1,7 +1,6 @@
 // NUnit 3 tests
 // See documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation
 using Intersect.Plugins.Loaders;
-
 using NUnit.Framework;
 
 namespace Intersect.Examples.Plugin.Client

diff --git a/Examples/Intersect.Examples.Plugin.Client/ExampleCommandLineOptions.cs b/Examples/Intersect.Examples.Plugin.Client/ExampleCommandLineOptions.cs
@@ -1,7 +1,5 @@
 using CommandLine;
-
 using Intersect.Utilities;
-
 using System;
 
 namespace Intersect.Examples.Plugin.Client

diff --git a/Examples/Intersect.Examples.Plugin.Client/ExamplePluginConfiguration.cs b/Examples/Intersect.Examples.Plugin.Client/ExamplePluginConfiguration.cs
@@ -1,5 +1,4 @@
 using Intersect.Plugins;
-
 using Newtonsoft.Json;
 
 namespace Intersect.Examples.Plugin.Client

diff --git a/Examples/Intersect.Examples.Plugin.Client/Manifest.cs b/Examples/Intersect.Examples.Plugin.Client/Manifest.cs
@@ -1,9 +1,7 @@
 using Intersect.Plugins.Interfaces;
 using Intersect.Plugins.Manifests.Types;
 using Intersect.Utilities;
-
 using Semver;
-
 using System;
 using System.Collections.Generic;
 

diff --git a/Examples/Intersect.Examples.Plugin.Client/PacketHandlers/ExamplePluginServerPacketHandler.cs b/Examples/Intersect.Examples.Plugin.Client/PacketHandlers/ExamplePluginServerPacketHandler.cs
@@ -1,8 +1,6 @@
 using Intersect.Examples.Plugin.Packets.Client;
 using Intersect.Examples.Plugin.Packets.Server;
-using Intersect.Logging;
 using Intersect.Network;
-
 using System;
 
 namespace Intersect.Examples.Plugin.Client.PacketHandlers
@@ -21,15 +19,15 @@ public bool Handle(IPacketSender packetSender, ExamplePluginServerPacket packet)
                 throw new ArgumentNullException(nameof(packet));
             }
 
-            Log.Info($"Received server packet! The server said '{packet.ExamplePluginMessage}'.");
+            ApplicationContext.Context.Value?.Logger.LogInformation($"Received server packet! The server said '{packet.ExamplePluginMessage}'.");
 
             var packetSent = packetSender.Send(new ExamplePluginClientPacket("A message from the client!"));
             if (packetSent)
             {
-                Log.Info("Sent response back to the server!");
+                ApplicationContext.Context.Value?.Logger.LogInformation("Sent response back to the server!");
             } else
             {
-                Log.Error("Failed to send response back to the server!");
+                ApplicationContext.Context.Value?.Logger.LogError("Failed to send response back to the server!");
             }
 
             return packetSent;

diff --git a/Examples/Intersect.Examples.Plugin.Server/ExampleServerPluginEntry.cs b/Examples/Intersect.Examples.Plugin.Server/ExampleServerPluginEntry.cs
@@ -5,7 +5,6 @@
 using Intersect.Network.Packets.Client;
 using Intersect.Plugins;
 using Intersect.Server.Plugins;
-
 using System;
 
 namespace Intersect.Examples.Plugin.Server

diff --git a/Examples/Intersect.Examples.Plugin.Server/Manifest.cs b/Examples/Intersect.Examples.Plugin.Server/Manifest.cs
@@ -1,9 +1,7 @@
 using Intersect.Plugins.Interfaces;
 using Intersect.Plugins.Manifests.Types;
 using Intersect.Utilities;
-
 using Semver;
-
 using System;
 using System.Collections.Generic;
 

diff --git a/.../Intersect.Examples.Plugin.Server/Networking/Handlers/ExamplePluginClientPacketHandler.cs b/.../Intersect.Examples.Plugin.Server/Networking/Handlers/ExamplePluginClientPacketHandler.cs
@@ -1,5 +1,4 @@
 using Intersect.Examples.Plugin.Packets.Client;
-using Intersect.Logging;
 using Intersect.Network;
 
 namespace Intersect.Examples.Plugin.Server.Networking.Handlers
@@ -8,7 +7,7 @@ public class ExamplePluginClientPacketHandler : IPacketHandler<ExamplePluginClie
     {
         public bool Handle(IPacketSender packetSender, ExamplePluginClientPacket packet)
         {
-            Log.Info($"Received example plugin response from the client: {packet.ExamplePluginMessage}");
+            ApplicationContext.Context.Value?.Logger.LogInformation($"Received example plugin response from the client: {packet.ExamplePluginMessage}");
             return true;
         }
 

diff --git a/Examples/Intersect.Examples.Plugin.Server/Networking/Hooks/ExamplePluginLoginPostHook.cs b/Examples/Intersect.Examples.Plugin.Server/Networking/Hooks/ExamplePluginLoginPostHook.cs
@@ -1,5 +1,4 @@
 using Intersect.Examples.Plugin.Packets.Server;
-using Intersect.Logging;
 using Intersect.Network;
 using Intersect.Network.Packets.Client;
 
@@ -12,11 +11,11 @@ public bool Handle(IPacketSender packetSender, LoginPacket packet)
             var packetSent = packetSender.Send(new ExamplePluginServerPacket($"Login packet received: {packet.Username}"));
             if (packetSent)
             {
-                Log.Info("Sent a message to the client!");
+                ApplicationContext.Context.Value?.Logger.LogInformation("Sent a message to the client!");
             }
             else
             {
-                Log.Error("Failed to send a message to the client!");
+                ApplicationContext.Context.Value?.Logger.LogError("Failed to send a message to the client!");
             }
 
             return packetSent;

diff --git a/Examples/Intersect.Examples.Plugin/Packets/Client/ExamplePluginClientPacket.cs b/Examples/Intersect.Examples.Plugin/Packets/Client/ExamplePluginClientPacket.cs
@@ -1,5 +1,4 @@
 using Intersect.Network;
-
 using MessagePack;
 
 namespace Intersect.Examples.Plugin.Packets.Client

diff --git a/Examples/Intersect.Examples.Plugin/Packets/Server/ExamplePluginServerPacket.cs b/Examples/Intersect.Examples.Plugin/Packets/Server/ExamplePluginServerPacket.cs
@@ -1,5 +1,4 @@
 using Intersect.Network;
-
 using MessagePack;
 
 namespace Intersect.Examples.Plugin.Packets.Server

diff --git a/Framework/Intersect.Framework.Core/Collections/DatabaseObjectLookup.cs b/Framework/Intersect.Framework.Core/Collections/DatabaseObjectLookup.cs
@@ -1,9 +1,11 @@
 using System.Collections;
 using System.Text;
+using Intersect.Core;
 using Intersect.Enums;
-using Intersect.Logging;
+using Intersect.Framework.Reflection;
 using Intersect.Models;
 using Intersect.Utilities;
+using Microsoft.Extensions.Logging;
 
 namespace Intersect.Collections;
 
@@ -73,9 +75,12 @@ public List<IDatabaseObject> ValueList
                 }
                 catch (Exception exception)
                 {
-                    LegacyLogging.Logger?.Warn(
+                    ApplicationContext.Context.Value?.Logger.LogWarning(
                         exception,
-                        $@"{StoredType.Name}[Count={mIdMap.Count},NullCount={mIdMap.Count(pair => pair.Value == null)}]"
+                        "{StoredType}[Count={Count}, Null={NullCount}]",
+                        StoredType.GetName(qualified: true),
+                        mIdMap.Count,
+                        mIdMap.Count(pair => pair.Value == null)
                     );
 
                     throw;

diff --git a/Framework/Intersect.Framework.Core/Config/DatabaseOptions.cs b/Framework/Intersect.Framework.Core/Config/DatabaseOptions.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -31,8 +30,8 @@ public partial class DatabaseOptions
         NullValueHandling = NullValueHandling.Ignore,
         DefaultValueHandling = DefaultValueHandling.Populate
     )]
-    [DefaultValue(Logging.LogLevel.Error)]
-    public Logging.LogLevel LogLevel { get; set; } = Logging.LogLevel.Error;
+    [DefaultValue(Microsoft.Extensions.Logging.LogLevel.Error)]
+    public Microsoft.Extensions.Logging.LogLevel LogLevel { get; set; } = Microsoft.Extensions.Logging.LogLevel.Error;
 
     public bool KillServerOnConcurrencyException { get; set; } = DefaultKillServerOnConcurrencyException;
 }
diff --git a/Framework/Intersect.Framework.Core/Config/LoggingOptions.cs b/Framework/Intersect.Framework.Core/Config/LoggingOptions.cs
@@ -1,10 +1,13 @@
-using Intersect.Logging;
+using Intersect.Framework.Core.Serialization;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 
 namespace Intersect.Config;
 
 public partial class LoggingOptions
 {
-    public LogLevel Level { get; set; } = LogLevel.Info;
+    [JsonConverter(typeof(SafeStringEnumConverter))]
+    public LogLevel Level { get; set; } = LogLevel.Information;
 
     /// <summary>
     /// Determines whether chat logs should be written into the logging database

diff --git a/Framework/Intersect.Framework.Core/Config/PaperdollOptions.cs b/Framework/Intersect.Framework.Core/Config/PaperdollOptions.cs
@@ -1,5 +1,4 @@
 using System.Runtime.Serialization;
-
 using Newtonsoft.Json;
 
 namespace Intersect.Config;

diff --git a/Framework/Intersect.Framework.Core/Config/Passability.cs b/Framework/Intersect.Framework.Core/Config/Passability.cs
@@ -1,5 +1,4 @@
 using System.Runtime.Serialization;
-
 using Newtonsoft.Json;
 
 namespace Intersect.Config;

diff --git a/Framework/Intersect.Framework.Core/Configuration/ClientConfiguration.cs b/Framework/Intersect.Framework.Core/Configuration/ClientConfiguration.cs
@@ -1,9 +1,8 @@
 using System.ComponentModel;
 using System.Runtime.Serialization;
-
 using Intersect.Enums;
-using Intersect.Logging;
 using Intersect.Utilities;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace Intersect.Configuration;
@@ -264,8 +263,8 @@ public void Validate()
     #region Hidden Properties
 
     [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-    [DefaultValue(LogLevel.Info)]
-    public LogLevel LogLevel { get; set; } = LogLevel.Info;
+    [DefaultValue(LogLevel.Information)]
+    public LogLevel LogLevel { get; set; } = LogLevel.Information;
 
     #endregion
 

diff --git a/Framework/Intersect.Framework.Core/Configuration/ConfigurationHelper.cs b/Framework/Intersect.Framework.Core/Configuration/ConfigurationHelper.cs
@@ -1,8 +1,8 @@
 using System.Text;
-
+using Intersect.Core;
+using Intersect.Framework.Reflection;
 using Intersect.IO.Files;
-using Intersect.Logging;
-
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace Intersect.Configuration;
@@ -34,7 +34,12 @@ public static T Load<T>(T configuration, string filePath, bool failQuietly = fal
         }
         catch (Exception exception)
         {
-            LegacyLogging.Logger?.Error(exception);
+            ApplicationContext.Context.Value?.Logger.LogError(
+                exception,
+                "Error when reading {ConfigurationType} from {FilePath}",
+                typeof(T).GetName(qualified: true),
+                filePath
+            );
 
             throw;
         }
@@ -46,12 +51,12 @@ public static T Save<T>(T configuration, string filePath, bool failQuietly = fal
         var directoryPath = Path.GetDirectoryName(filePath);
         if (directoryPath == null)
         {
-            throw new ArgumentNullException();
+            throw new ArgumentException($"'{filePath}' has no directory name", nameof(filePath));
         }
 
         if (!FileSystemHelper.EnsureDirectoryExists(directoryPath))
         {
-            throw new FileNotFoundException("Missing directory.", directoryPath);
+            throw new DirectoryNotFoundException($"Directory does not exist: {directoryPath}");
         }
 
         try
@@ -64,7 +69,12 @@ public static T Save<T>(T configuration, string filePath, bool failQuietly = fal
         }
         catch (Exception exception)
         {
-            LegacyLogging.Logger?.Error(exception);
+            ApplicationContext.Context.Value?.Logger.LogError(
+                exception,
+                "Error when writing {ConfigurationType} to {FilePath}",
+                typeof(T).GetName(qualified: true),
+                filePath
+            );
 
             throw;
         }
@@ -84,7 +94,12 @@ public static T LoadSafely<T>(T configuration, string filePath = null)
         }
         catch (Exception exception)
         {
-            LegacyLogging.Logger?.Warn(exception);
+            ApplicationContext.Context.Value?.Logger.LogWarning(
+                exception,
+                "Error when reading {ConfigurationType} to {FilePath}",
+                typeof(T).GetName(qualified: true),
+                filePath
+            );
         }
         finally
         {
@@ -94,7 +109,12 @@ public static T LoadSafely<T>(T configuration, string filePath = null)
             }
             catch (Exception exception)
             {
-                LegacyLogging.Logger?.Error(exception);
+                ApplicationContext.Context.Value?.Logger.LogError(
+                    exception,
+                    "Error when writing {ConfigurationType} to {FilePath}",
+                    typeof(T).GetName(qualified: true),
+                    filePath
+                );
             }
         }
 

diff --git a/Framework/Intersect.Framework.Core/Core/ApplicationContext.cs b/Framework/Intersect.Framework.Core/Core/ApplicationContext.cs
@@ -0,0 +1,6 @@
+namespace Intersect.Core;
+
+public static class ApplicationContext
+{
+    public static readonly AsyncLocal<IApplicationContext?> Context = new();
+}
diff --git a/Framework/Intersect.Framework.Core/Core/IApplicationContext.cs b/Framework/Intersect.Framework.Core/Core/IApplicationContext.cs
@@ -1,6 +1,7 @@
-using Intersect.Logging;
+
 using Intersect.Plugins.Interfaces;
 using Intersect.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace Intersect.Core;
 
@@ -63,8 +64,8 @@ public interface IApplicationContext : IDisposable
     void Start(bool lockUntilShutdown = true);
 
     /// <summary>
-    /// Start the application with a <see cref="LockingActionQueue"/>.
+    /// Start the application with a <see cref="ILockingActionQueue"/>.
     /// </summary>
-    /// <returns>the <see cref="LockingActionQueue"/> instance being used</returns>
+    /// <returns>the <see cref="ILockingActionQueue"/> instance being used</returns>
     ILockingActionQueue StartWithActionQueue();
 }
diff --git a/Framework/Intersect.Framework.Core/Entities/ExperienceCurve.cs b/Framework/Intersect.Framework.Core/Entities/ExperienceCurve.cs
@@ -1,5 +1,5 @@
-using Intersect.Logging;
-
+using Intersect.Core;
+using Microsoft.Extensions.Logging;
 using NCalc;
 
 namespace Intersect.Server.Utilities;
@@ -45,7 +45,7 @@ protected virtual void Exp(FunctionArgs args)
     {
         if (args.Parameters == null || args.Parameters.Length < 3)
         {
-            LegacyLogging.Logger?.Error("Tried to execute Exp with fewer than three arguments.");
+            ApplicationContext.Context.Value?.Logger.LogError("Tried to execute Exp with fewer than three arguments.");
             args.Result = 0L;
         }
 

diff --git a/Framework/Intersect.Framework.Core/GameObjects/AnimationBase.cs b/Framework/Intersect.Framework.Core/GameObjects/AnimationBase.cs
@@ -1,8 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Intersect.Models;
-
 using Microsoft.EntityFrameworkCore;
-
 using Newtonsoft.Json;
 
 namespace Intersect.GameObjects;

diff --git a/Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorBooleanAttribute.cs b/Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorBooleanAttribute.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-
 using Intersect.Localization;
 
 namespace Intersect.GameObjects.Annotations;

diff --git a/Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorDictionaryAttribute.cs b/Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorDictionaryAttribute.cs
@@ -4,7 +4,7 @@
 using Intersect.Localization;
 
 #if !DEBUG
-using Intersect.Logging;
+
 #endif
 
 namespace Intersect.GameObjects.Annotations;

diff --git a/Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorFormattedAttribute.cs b/Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorFormattedAttribute.cs
@@ -1,9 +1,8 @@
 using System.Reflection;
-
 using Intersect.Localization;
 
 #if !DEBUG
-using Intersect.Logging;
+
 #endif
 
 namespace Intersect.GameObjects.Annotations;

diff --git a/Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorReferenceAttribute.cs b/Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorReferenceAttribute.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-
 using Intersect.Collections;
 using Intersect.GameObjects.Maps;
 using Intersect.GameObjects.Maps.MapList;