Merge branch 'main' into mc-connect-logging

This reverts commit 3261c01bfa.

src/PepperDash.Core/Logging/Debug.cs

@@ -466,14 +466,14 @@ namespace PepperDash.Core
         /// </summary>
         public static void SetFileMinimumDebugLevel(LogEventLevel level)
         {
-            _errorLogLevelSwitch.MinimumLevel = level;
+            _fileLevelSwitch.MinimumLevel = level;
 
-            var err = CrestronDataStoreStatic.SetLocalUintValue(ErrorLogLevelStoreKey, (uint)level);
+            var err = CrestronDataStoreStatic.SetLocalUintValue(FileLevelStoreKey, (uint)level);
 
             if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
                 LogMessage(LogEventLevel.Information, "Error saving File debug level setting: {error}", err);
 
-            LogMessage(LogEventLevel.Information, "File debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
+            LogMessage(LogEventLevel.Information, "File debug level set to {0}", _fileLevelSwitch.MinimumLevel);
         }
 
         /// <summary>

src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs

@@ -244,13 +244,15 @@ namespace PepperDash.Essentials
             CrestronEnvironment.ProgramStatusEventHandler +=
                 CrestronEnvironment_ProgramStatusEventHandler;
 
-            ApiOnlineAndAuthorized = new BoolFeedback(() =>
+            ApiOnlineAndAuthorized = new BoolFeedback("apiOnlineAndAuthorized", () =>
             {
                 if (_wsClient2 == null)
                     return false;
 
                 return _wsClient2.IsAlive && IsAuthorized;
             });
+
+            Debug.SetFileMinimumDebugLevel(Serilog.Events.LogEventLevel.Debug);
         }
 
         private void SetupDefaultRoomMessengers()
@@ -1917,7 +1919,8 @@ namespace PepperDash.Essentials
         /// <param name="e"></param>
         private void HandleError(object sender, ErrorEventArgs e)
         {
-            this.LogError("Websocket error {0}", e.Message);
+            this.LogError("Websocket error {message}", e.Message);
+            this.LogError(e.Exception, "Websocket error");
 
             IsAuthorized = false;
             StartServerReconnectTimer();
@@ -1930,7 +1933,7 @@ namespace PepperDash.Essentials
         /// <param name="e"></param>
         private void HandleClose(object sender, CloseEventArgs e)
         {
-            this.LogDebug(
+            this.LogInformation(
                 "Websocket close {code} {reason}, clean={wasClean}",
                 e.Code,
                 e.Reason,

src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs

@@ -200,19 +200,6 @@ namespace PepperDash.Essentials.Touchpanel
                 this.csSubnetMask = System.Net.IPAddress.Parse(csSubnetMask);
                 this.csIpAddress = System.Net.IPAddress.Parse(csIpAddress);
             }
-            catch (ArgumentException)
-            {
-                Debug.LogInformation("This processor does not have a CS LAN", this);
-            }
-            catch (InvalidOperationException)
-            {
-                Debug.LogInformation("This processor does not have a CS LAN", this);
-            }
-            catch (Exception ex)
-            {
-                Debug.LogError($"Unexpected exception when checking CS LAN: {ex}", this);
-            }
-        }
 
         /// <summary>
         /// Updates the theme setting for this touchpanel controller and persists the change to configuration.
@@ -452,7 +439,7 @@ namespace PepperDash.Essentials.Touchpanel
 
             var processorIp = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, lanAdapterId);
 
-            if(csIpAddress == null || csSubnetMask == null || url == null)
+            if (csIpAddress == null || csSubnetMask == null || url == null)
             {
                 this.LogWarning("CS IP Address Subnet Mask or url is null, cannot determine correct IP for URL");
                 return url;