Better connection error handling

- NutSocket should not try to gracefully disconnect if it isn't already connected
- Also made NutSocket less chatty. Upper-level classes handle that.
- Updated ConnectionError event in UPS to include the UPS object.
- Propagated connection handling changes to WinNUT.vb
- Removed some commented out code from the Globals file.

Author: gbakeman

WinNUT_V2/WinNUT-Client/WinNUT.vb

@@ -299,7 +299,7 @@ Public Class WinNUT
 
     Private Sub UPS_Connect()
         Dim Nut_Config As Nut_Parameter
-        ' LogFile.LogTracing("Client UPS_Connect subroutine beginning.", LogLvl.LOG_NOTICE, Me)
+        LogFile.LogTracing("Client UPS_Connect subroutine beginning.", LogLvl.LOG_NOTICE, Me)
 
         Nut_Config = New Nut_Parameter(Arr_Reg_Key.Item("ServerAddress"),
                                        Arr_Reg_Key.Item("Port"),
@@ -326,20 +326,21 @@ Public Class WinNUT
         '    ' .Enabled = True
         'End With
 
-        If Not (UPS_Device.IsConnected And UPS_Device.IsAuthenticated) Then
-            LogFile.LogTracing(String.Format("Something went wrong connecting to UPS {0}. IsConnected: {1}, IsAuthenticated: {2}",
-                               upsConf.UPSName, UPS_Device.IsConnected, UPS_Device.IsAuthenticated), LogLvl.LOG_ERROR, Me,
-                               String.Format(StrLog.Item(AppResxStr.STR_LOG_CON_FAILED), upsConf.Host, upsConf.Port, "Connection Error"))
-            UPSDisconnect()
-        Else
-            Menu_UPS_Var.Enabled = True
-            UpdateIcon_NotifyIcon()
-            LogFile.LogTracing("Update Icon", LogLvl.LOG_DEBUG, Me)
-            RaiseEvent UpdateNotifyIconStr("Connected", Nothing)
-            LogFile.LogTracing("Connection to Nut Host Established", LogLvl.LOG_NOTICE, Me,
-                               String.Format(StrLog.Item(AppResxStr.STR_LOG_CONNECTED),
-                                             upsConf.Host, upsConf.Port))
-        End If
+        Menu_UPS_Var.Enabled = True
+        UpdateIcon_NotifyIcon()
+        LogFile.LogTracing("Update Icon", LogLvl.LOG_DEBUG, Me)
+        RaiseEvent UpdateNotifyIconStr("Connected", Nothing)
+        LogFile.LogTracing("Connection to Nut Host Established", LogLvl.LOG_NOTICE, Me,
+                           String.Format(StrLog.Item(AppResxStr.STR_LOG_CONNECTED),
+                                         upsConf.Host, upsConf.Port))
+    End Sub
+
+    Private Sub ConnectionError(sender As UPS_Device, ex As Exception) Handles UPS_Device.ConnectionError
+        LogFile.LogTracing(String.Format("Something went wrong connecting to UPS {0}. IsConnected: {1}, IsAuthenticated: {2}",
+                               sender.Name, sender.IsConnected, sender.IsAuthenticated), LogLvl.LOG_ERROR, Me,
+                               String.Format(StrLog.Item(AppResxStr.STR_LOG_CON_FAILED), sender.Nut_Config.Host, sender.Nut_Config.Port,
+                                             ex.Message))
+        UPSDisconnect()
     End Sub
 
     ''' <summary>

WinNUT_V2/WinNUT-Client_Common/Nut_Socket.vb

@@ -140,18 +140,15 @@ Public Class Nut_Socket
     Public Sub Disconnect(Optional silent = False, Optional forceful = False)
         ' WatchDog.Stop()
 
-        If Not forceful Then
+        If IsConnected AndAlso Not forceful Then
             Query_Data("LOGOUT")
         End If
 
         Close_Socket()
 
         If Not silent Then
-            LogFile.LogTracing("NutSocket raising Disconnected event.", LogLvl.LOG_DEBUG, Me)
             RaiseEvent SocketDisconnected()
         End If
-
-        LogFile.LogTracing("NutSocket has been Disconnected.", LogLvl.LOG_DEBUG, Me)
     End Sub
 
     ''' <summary>

WinNUT_V2/WinNUT-Client_Common/UPS_Device.vb

@@ -137,7 +137,7 @@ Public Class UPS_Device
     ' Notify of an unexpectedly lost connection (??)
     Public Event Lost_Connect()
     ' Error encountered when trying to connect.
-    Public Event ConnectionError(innerException As Exception)
+    Public Event ConnectionError(sender As UPS_Device, innerException As Exception)
     Public Event EncounteredNUTException(ex As NutException, sender As Object)
     Public Event New_Retry()
     ' Public Event Shutdown_Condition()
@@ -183,7 +183,7 @@ Public Class UPS_Device
             RaiseEvent EncounteredNUTException(ex, Me)
 
         Catch ex As Exception
-            RaiseEvent ConnectionError(ex)
+            RaiseEvent ConnectionError(Me, ex)
 
         End Try
     End Sub

WinNUT_V2/WinNUT-Client_Common/WinNUT_Globals.vb

@@ -47,51 +47,6 @@ Public Module WinNUT_Globals
         GitHubURL = My.Application.Info.Trademark
         Copyright = My.Application.Info.Copyright
         IsConnected = False
-
-        'Add Main Gui's Strings
-        'StrLog.Insert(AppResxStr.STR_MAIN_OLDINI_RENAMED, Resources.Frm_Main_Str_01)
-        'StrLog.Insert(AppResxStr.STR_MAIN_OLDINI, Resources.Frm_Main_Str_02)
-        'StrLog.Insert(AppResxStr.STR_MAIN_RECONNECT, Resources.Frm_Main_Str_03)
-        'StrLog.Insert(AppResxStr.STR_MAIN_RETRY, Resources.Frm_Main_Str_04)
-        'StrLog.Insert(AppResxStr.STR_MAIN_NOTCONN, Resources.Frm_Main_Str_05)
-        'StrLog.Insert(AppResxStr.STR_MAIN_CONN, Resources.Frm_Main_Str_06)
-        'StrLog.Insert(AppResxStr.STR_MAIN_OL, Resources.Frm_Main_Str_07)
-        'StrLog.Insert(AppResxStr.STR_MAIN_OB, Resources.Frm_Main_Str_08)
-        'StrLog.Insert(AppResxStr.STR_MAIN_LOWBAT, Resources.Frm_Main_Str_09)
-        'StrLog.Insert(AppResxStr.STR_MAIN_BATOK, Resources.Frm_Main_Str_10)
-        'StrLog.Insert(AppResxStr.STR_MAIN_UNKNOWN_UPS, Resources.Frm_Main_Str_11)
-        'StrLog.Insert(AppResxStr.STR_MAIN_LOSTCONNECT, Resources.Frm_Main_Str_12)
-        'StrLog.Insert(AppResxStr.STR_MAIN_INVALIDLOGIN, Resources.Frm_Main_Str_13)
-        'StrLog.Insert(AppResxStr.STR_MAIN_EXITSLEEP, Resources.Frm_Main_Str_14)
-        'StrLog.Insert(AppResxStr.STR_MAIN_GOTOSLEEP, Resources.Frm_Main_Str_15)
-
-        'Add Update Gui's Strings
-        'StrLog.Insert(AppResxStr.STR_UP_AVAIL, Resources.Frm_Update_Str_01)
-        'StrLog.Insert(AppResxStr.STR_UP_SHOW, Resources.Frm_Update_Str_02)
-        'StrLog.Insert(AppResxStr.STR_UP_HIDE, Resources.Frm_Update_Str_03)
-        'StrLog.Insert(AppResxStr.STR_UP_UPMSG, Resources.Frm_Update_Str_04)
-        'StrLog.Insert(AppResxStr.STR_UP_DOWNFROM, Resources.Frm_Update_Str_05)
-
-        'Add Shutdown Gui's Strings
-        'StrLog.Insert(AppResxStr.STR_SHUT_STAT, Resources.Frm_Shutdown_Str_01)
-
-        'Add App Event's Strings 
-        'StrLog.Insert(AppResxStr.STR_APP_SHUT, Resources.App_Event_Str_01)
-
-        'Add Log's Strings
-        'StrLog.Insert(AppResxStr.STR_LOG_PREFS, Resources.Log_Str_01)
-        'StrLog.Insert(AppResxStr.STR_LOG_CONNECTED, Resources.Log_Str_02)
-        'StrLog.Insert(AppResxStr.STR_LOG_CON_FAILED, Resources.Log_Str_03)
-        'StrLog.Insert(AppResxStr.STR_LOG_CON_RETRY, Resources.Log_Str_04)
-        'StrLog.Insert(AppResxStr.STR_LOG_LOGOFF, Resources.Log_Str_05)
-        'StrLog.Insert(AppResxStr.STR_LOG_NEW_RETRY, Resources.Log_Str_06)
-        'StrLog.Insert(AppResxStr.STR_LOG_STOP_RETRY, Resources.Log_Str_07)
-        'StrLog.Insert(AppResxStr.STR_LOG_SHUT_START, Resources.Log_Str_08)
-        'StrLog.Insert(AppResxStr.STR_LOG_SHUT_STOP, Resources.Log_Str_09)
-        'StrLog.Insert(AppResxStr.STR_LOG_NO_UPDATE, Resources.Log_Str_10)
-        'StrLog.Insert(AppResxStr.STR_LOG_UPDATE, Resources.Log_Str_11)
-        'StrLog.Insert(AppResxStr.STR_LOG_NUT_FSD, Resources.Log_Str_12)
-
         LogFile = New Logger(False, LogLvl.LOG_DEBUG)
     End Sub