Merge pull request #2846 from snakefoot/master

NLogConfig - TouchAndApplyNLogConfig with Exception handler
shadowsocks · Apr 9, 2020 · 6767916 · 6767916
2 parents 23ce58a + b1acc75
commit 6767916
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/shadowsocks-csharp/Model/NlogConfig.cs b/shadowsocks-csharp/Model/NlogConfig.cs
@@ -108,11 +108,20 @@ private static XmlNode SelectSingleNode(XmlDocument doc, string xpath)
         /// </summary>
         public static void TouchAndApplyNLogConfig()
         {
-            if (!File.Exists(NLOG_CONFIG_FILE_NAME))
+            try
             {
+                if (File.Exists(NLOG_CONFIG_FILE_NAME))
+                    return; // NLog.config exists, and has already been loaded
+
                 File.WriteAllText(NLOG_CONFIG_FILE_NAME, Properties.Resources.NLog_config);
-                LogManager.LoadConfiguration(NLOG_CONFIG_FILE_NAME);
             }
+            catch (Exception ex)
+            {
+                NLog.Common.InternalLogger.Error(ex, "[shadowsocks] Failed to setup default NLog.config: {0}", NLOG_CONFIG_FILE_NAME);
+                return;
+            }
+
+            LoadConfiguration();    // Load the new config-file
         }
 
         /// <summary>