Merge branch 'next' into next

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -110,15 +110,16 @@ public void Startup()
         {
             EnsureLogFolderPathExists();
             EnsureTempPathExists();
-            LogRubberduckSart();
             LoadConfig();
+
+            LogRubberduckStart();
+            UpdateLoggingLevel();
+            
             CheckForLegacyIndenterSettings();
             _appMenus.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
 
-            UpdateLoggingLevel();
-
             if (_config.UserSettings.GeneralSettings.CheckVersion)
             {
                 _checkVersionCommand.Execute(null);
@@ -185,19 +186,19 @@ private void CheckForLegacyIndenterSettings()
             }
         }
 
-        private void LogRubberduckSart()
+        public void LogRubberduckStart()
         {
             var version = _version.CurrentVersion;
             GlobalDiagnosticsContext.Set("RubberduckVersion", version.ToString());
             var headers = new List<string>
             {
-                string.Format("Rubberduck version {0} loading:", version),
+                string.Format("\r\n\tRubberduck version {0} loading:", version),
                 string.Format("\tOperating System: {0} {1}", Environment.OSVersion.VersionString, Environment.Is64BitOperatingSystem ? "x64" : "x86"),
                 string.Format("\tHost Product: {0} {1}", Application.ProductName, Environment.Is64BitProcess ? "x64" : "x86"),
                 string.Format("\tHost Version: {0}", Application.ProductVersion),
                 string.Format("\tHost Executable: {0}", Path.GetFileName(Application.ExecutablePath)),
             };
-            Logger.Log(LogLevel.Info, string.Join(Environment.NewLine, headers));
+            LogLevelHelper.SetDebugInfo(string.Join(Environment.NewLine, headers));
         }
 
         private bool _disposed;

RetailCoder.VBE/Common/LogLevelHelper.cs

@@ -10,6 +10,10 @@ public static class LogLevelHelper
     {
         private static readonly Lazy<IEnumerable<LogLevel>> _logLevels = new Lazy<IEnumerable<LogLevel>>(GetLogLevels);
 
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+        private static string LogHeader;
+        private static bool LogHeaderWritten;
+
         public static IEnumerable<LogLevel> LogLevels
         {
             get
@@ -39,8 +43,24 @@ public static int MaxLogLevel()
             return GetLogLevels().Max(lvl => lvl.Ordinal);
         }
 
+        public static void SetDebugInfo(String value)
+        {
+            LogHeader = value;
+            LogHeaderWritten = false;
+        }
+
         public static void SetMinimumLogLevel(LogLevel minimumLogLevel)
         {
+            if (LogManager.GlobalThreshold == minimumLogLevel) 
+            {
+                return;
+            }
+            if (LogHeaderWritten == true)
+            {
+                Logger.Log(LogLevel.Info, "Minimum log level changing from " + 
+                    LogManager.GlobalThreshold.Name +
+                    " to " + minimumLogLevel.Name);
+            }
             var loggingRules = LogManager.Configuration.LoggingRules;
             foreach (var loggingRule in loggingRules)
             {
@@ -49,6 +69,7 @@ public static void SetMinimumLogLevel(LogLevel minimumLogLevel)
             if (minimumLogLevel == LogLevel.Off)
             {
                 LogManager.DisableLogging();
+                LogManager.GlobalThreshold = minimumLogLevel;
                 LogManager.ReconfigExistingLoggers();
                 return;
             }
@@ -63,7 +84,13 @@ public static void SetMinimumLogLevel(LogLevel minimumLogLevel)
                     }
                 }
             }
+            LogManager.GlobalThreshold = minimumLogLevel;
             LogManager.ReconfigExistingLoggers();
+            if (LogHeaderWritten == false)
+            {
+                Logger.Log(minimumLogLevel, LogHeader);
+                LogHeaderWritten = true;
+            }
         }
 
         private static void ClearLogLevels(LoggingRule loggingRule)