Handle adverse connection conditions on resume

It appears that if WinNUT resumes operation from a suspended state and the computer's networking is not prepared for a connection, then WinNUT will only try reconnecting once and hard-fail without launching a reconnection timer. Connect_UPS has been modified so that it will launch the reconnection timer if required by the caller.
- Reconnection interval is now 5 seconds regardless of compiler constants

Author: gbakeman

WinNUT_V2/WinNUT-Client/WinNUT.vb

@@ -286,12 +286,12 @@ Public Class WinNUT
             Case Microsoft.Win32.PowerModes.Resume
                 LogFile.LogTracing("Restarting WinNUT after waking up from Windows", LogLvl.LOG_NOTICE, Me, StrLog.Item(AppResxStr.STR_MAIN_EXITSLEEP))
                 If Arr_Reg_Key.Item("AutoReconnect") = True Then
-                    UPS_Connect()
+                    UPS_Connect(True)
                 End If
         End Select
     End Sub
 
-    Private Sub UPS_Connect()
+    Private Sub UPS_Connect(Optional retryOnConnFailure = False)
         Dim Nut_Config As Nut_Parameter
         LogFile.LogTracing("Client UPS_Connect subroutine beginning.", LogLvl.LOG_NOTICE, Me)
 
@@ -303,7 +303,7 @@ Public Class WinNUT
                                        Arr_Reg_Key.Item("AutoReconnect"))
 
         UPS_Device = New UPS_Device(Nut_Config, LogFile, Arr_Reg_Key.Item("Delay"))
-        UPS_Device.Connect_UPS()
+        UPS_Device.Connect_UPS(retryOnConnFailure)
     End Sub
 
     ''' <summary>

WinNUT_V2/WinNUT-Client_Common/UPS_Device.vb

@@ -53,11 +53,7 @@ Public Class UPS_Device
 #End Region
     Private Const CosPhi As Double = 0.6
     ' How many milliseconds to wait before the Reconnect routine tries again.
-#If DEBUG Then
     Private Const DEFAULT_RECONNECT_WAIT_MS As Double = 5000
-#Else
-    Private Const DEFAULT_RECONNECT_WAIT_MS As Double = 30000
-#End If
 
     Private WithEvents Update_Data As New Timer
     'Private Nut_Conn As Nut_Comm
@@ -169,7 +165,7 @@ Public Class UPS_Device
         'End With
     End Sub
 
-    Public Sub Connect_UPS()
+    Public Sub Connect_UPS(Optional retryOnConnFailure = False)
         LogFile.LogTracing("Beginning connection: " & Nut_Config.ToString(), LogLvl.LOG_DEBUG, Me)
 
         Try
@@ -185,6 +181,10 @@ Public Class UPS_Device
         Catch ex As Exception
             RaiseEvent ConnectionError(Me, ex)
 
+            If retryOnConnFailure Then
+                LogFile.LogTracing("Reconnection Process Started", LogLvl.LOG_NOTICE, Me)
+                Reconnect_Nut.Start()
+            End If
         End Try
     End Sub