Add support for logging/catching also very early messages

Author: JustArchi

ArchiSteamFarm/Logging.cs

@@ -39,44 +39,55 @@ internal static class Logging {
 		private static readonly HashSet<LoggingRule> ConsoleLoggingRules = new HashSet<LoggingRule>();
 		private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-		internal static void Init() {
+		private static bool IsUsingCustomConfiguration;
+
+		internal static void InitCoreLoggers() {
 			if (LogManager.Configuration != null) {
 				// User provided custom NLog config, or we have it set already, so don't override it
+				IsUsingCustomConfiguration = true;
 				InitConsoleLoggers();
 				return;
 			}
 
 			LoggingConfiguration config = new LoggingConfiguration();
 
+			ColoredConsoleTarget consoleTarget = new ColoredConsoleTarget("Console") {
+				Layout = Layout
+			};
+
+			config.AddTarget(consoleTarget);
+			config.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, consoleTarget));
+
+			LogManager.Configuration = config;
+			InitConsoleLoggers();
+		}
+
+		internal static void InitEnhancedLoggers() {
+			if (IsUsingCustomConfiguration) {
+				return;
+			}
+
 			if (Program.GlobalConfig.LogToFile) {
 				FileTarget fileTarget = new FileTarget("File") {
 					DeleteOldFileOnStartup = true,
 					FileName = Program.LogFile,
 					Layout = Layout
 				};
 
-				config.AddTarget(fileTarget);
-				config.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, fileTarget));
+				LogManager.Configuration.AddTarget(fileTarget);
+				LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, fileTarget));
 			}
 
 			if (Program.IsRunningAsService) {
 				EventLogTarget eventLogTarget = new EventLogTarget("EventLog") {
 					Layout = Layout
 				};
 
-				config.AddTarget(eventLogTarget);
-				config.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, eventLogTarget));
+				LogManager.Configuration.AddTarget(eventLogTarget);
+				LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, eventLogTarget));
 			}
 
-			ColoredConsoleTarget consoleTarget = new ColoredConsoleTarget("Console") {
-				Layout = Layout
-			};
-
-			config.AddTarget(consoleTarget);
-			config.LoggingRules.Add(new LoggingRule("*", LogLevel.Trace, consoleTarget));
-
-			LogManager.Configuration = config;
-			InitConsoleLoggers();
+			LogGenericInfo("Logging module initialized!");
 		}
 
 		internal static void OnUserInputStart() {

ArchiSteamFarm/Program.cs

@@ -458,7 +458,9 @@ private static void Init(IEnumerable<string> args) {
 			AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
 			TaskScheduler.UnobservedTaskException += UnobservedTaskExceptionHandler;
 
+			Logging.InitCoreLoggers();
 			Logging.LogGenericInfo("ASF V" + Version);
+
 			Directory.SetCurrentDirectory(ExecutableDirectory);
 			InitServices();
 
@@ -502,7 +504,7 @@ private static void Init(IEnumerable<string> args) {
 			}
 
 			// From now on it's server mode
-			Logging.Init();
+			Logging.InitEnhancedLoggers();
 
 			if (!Directory.Exists(ConfigDirectory)) {
 				Logging.LogGenericError("Config directory doesn't exist!");