Prevent GetLogger from being called before NLog init

Particular · Mar 18, 2024 · aa7fdb2 · aa7fdb2
1 parent ddf3eae
commit aa7fdb2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs b/src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs
@@ -289,7 +289,7 @@ int GetDataSpaceRemainingThreshold()
 
         void TryLoadLicenseFromConfig() => LicenseFileText = SettingsReader.Read<string>(SettingsRootNamespace, "LicenseText");
 
-        ILog logger = LogManager.GetLogger(typeof(Settings));
+        readonly ILog logger = LogManager.GetLogger(typeof(Settings));
         int maxBodySizeToStore = SettingsReader.Read(SettingsRootNamespace, "MaxBodySizeToStore", MaxBodySizeToStoreDefault);
         public const string DEFAULT_SERVICE_NAME = "Particular.ServiceControl.Audit";
         public static readonly SettingsRootNamespace SettingsRootNamespace = new("ServiceControl.Audit");

diff --git a/src/ServiceControl.Audit/Program.cs b/src/ServiceControl.Audit/Program.cs
@@ -22,7 +22,7 @@ class Program
         static async Task Main(string[] args)
         {
             AssemblyLoadContext.Default.Resolving += ResolveAssembly;
-            AppDomain.CurrentDomain.UnhandledException += (s, e) => Logger.Error("Unhandled exception was caught.", e.ExceptionObject as Exception);
+            AppDomain.CurrentDomain.UnhandledException += (s, e) => LogManager.GetLogger(typeof(Program)).Error("Unhandled exception was caught.", e.ExceptionObject as Exception);
 
             ExeConfiguration.PopulateAppSettings(Assembly.GetExecutingAssembly());
 
@@ -75,7 +75,5 @@ static Assembly TryLoadAssembly(AssemblyLoadContext loadContext, string folderPa
 
             return null;
         }
-
-        static readonly ILog Logger = LogManager.GetLogger(typeof(Program));
     }
 }
diff --git a/src/ServiceControl.Monitoring/Program.cs b/src/ServiceControl.Monitoring/Program.cs
@@ -17,7 +17,7 @@ static class Program
         static async Task Main(string[] args)
         {
             AssemblyLoadContext.Default.Resolving += ResolveAssembly;
-            AppDomain.CurrentDomain.UnhandledException += (s, e) => Logger.Error("Unhandled exception was caught.", e.ExceptionObject as Exception);
+            AppDomain.CurrentDomain.UnhandledException += (s, e) => LogManager.GetLogger(typeof(Program)).Error("Unhandled exception was caught.", e.ExceptionObject as Exception);
 
             ExeConfiguration.PopulateAppSettings(Assembly.GetExecutingAssembly());
 
@@ -65,7 +65,5 @@ static Assembly TryLoadAssembly(AssemblyLoadContext loadContext, string folderPa
 
             return null;
         }
-
-        static readonly ILog Logger = LogManager.GetLogger(typeof(Program));
     }
 }
diff --git a/src/ServiceControl/Infrastructure/Settings/Settings.cs b/src/ServiceControl/Infrastructure/Settings/Settings.cs
@@ -421,7 +421,7 @@ void LoadErrorIngestionSettings()
 
         void TryLoadLicenseFromConfig() => LicenseFileText = SettingsReader.Read<string>(SettingsRootNamespace, "LicenseText");
 
-        static readonly ILog logger = LogManager.GetLogger(typeof(Settings));
+        readonly ILog logger = LogManager.GetLogger(typeof(Settings));
         public const string DEFAULT_SERVICE_NAME = "Particular.ServiceControl";
         public static readonly SettingsRootNamespace SettingsRootNamespace = new("ServiceControl");
 

diff --git a/src/ServiceControl/Program.cs b/src/ServiceControl/Program.cs
@@ -21,7 +21,7 @@ class Program
         static async Task Main(string[] args)
         {
             AssemblyLoadContext.Default.Resolving += ResolveAssembly;
-            AppDomain.CurrentDomain.UnhandledException += (s, e) => Logger.Error("Unhandled exception was caught.", e.ExceptionObject as Exception);
+            AppDomain.CurrentDomain.UnhandledException += (s, e) => LogManager.GetLogger(typeof(Program)).Error("Unhandled exception was caught.", e.ExceptionObject as Exception);
 
             ExeConfiguration.PopulateAppSettings(Assembly.GetExecutingAssembly());
 
@@ -74,7 +74,5 @@ static Assembly TryLoadAssembly(AssemblyLoadContext loadContext, string folderPa
 
             return null;
         }
-
-        static readonly ILog Logger = LogManager.GetLogger(typeof(Program));
     }
 }