Persistent connections/indefinite reconnections

UPS_Device.vb - Provide a public readonly property indicating if the reconnect Timer is operating or not. - Remove retry connection attempt event, retry counter and max retries integer. - Connect_UPS subroutine only starts the reconnection timer on error if it isn't running already. - General exception in Retrieve_UPS_Datas no longer calls the disconnect subroutine, in favor of the Socket_Broken sub (prevents double notifications to listening code.) - Removed several strings related to reconnection attempts - Do not announce connection errors while attempting to reconnect
nutdotnet · Jul 25, 2024 · 886613f · 886613f
1 parent 25a7284
commit 886613f
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 218 deletions.
diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf
@@ -635,10 +635,6 @@ Ini File Moved to {0}.old</source>
           <source>Reconnection In Progress</source>
           <target state="translated">正在重新連線</target>
         </trans-unit>
-        <trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
-          <source>Try {0} of {1}</source>
-          <target state="translated">重試第 {0} 次，共 {1} 次</target>
-        </trans-unit>
         <trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
           <source>Not Connected</source>
           <target state="translated">未連線</target>
@@ -734,14 +730,6 @@ Cancel to Save Msi and Install Later</source>
           <source>Disconnected from Nut Host</source>
           <target state="translated">已與 NUT 伺服器中斷連線。</target>
         </trans-unit>
-        <trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
-          <source>Try Reconnect {0} / {1}</source>
-          <target state="translated">重試連線 {0} / {1}</target>
-        </trans-unit>
-        <trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
-          <source>Max Retry reached. Wait for manual Reconnection</source>
-          <target state="translated">已達最大重試次數，等待手動重新連線。</target>
-        </trans-unit>
         <trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
           <source>Conditions met for launching the Extinguishing Process</source>
           <target state="translated">啟動停機程序的條件</target>

diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf
@@ -1764,10 +1764,6 @@ Ini File Moved to {0}.old</source>
           <source>Reconnection In Progress</source>
           <target state="final">Wiederverbindung läuft</target>
         </trans-unit>
-        <trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
-          <source>Try {0} of {1}</source>
-          <target state="translated">Versuch {0} von {1}</target>
-        </trans-unit>
         <trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
           <source>Not Connected</source>
           <target state="final">Nicht verbunden</target>
@@ -1808,14 +1804,6 @@ Ini File Moved to {0}.old</source>
           <source>Disconnected from Nut Host</source>
           <target state="translated">Verbindung zum NUT-Host verloren</target>
         </trans-unit>
-        <trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
-          <source>Try Reconnect {0} / {1}</source>
-          <target state="translated">Versuche Wiederverbindung {0} / {1}</target>
-        </trans-unit>
-        <trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
-          <source>Max Retry reached. Wait for manual Reconnection</source>
-          <target state="translated">Maximale Anzahl Verbindungsversuche erreicht. Auf manuelle Wiederverbindung warten.</target>
-        </trans-unit>
         <trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
           <source>Conditions met for launching the Extinguishing Process</source>
           <target state="translated">Voraussetzungen für den Start des Löschprozesses liegen vor</target>

diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf
@@ -1788,10 +1788,6 @@ Fichier Ini déplacé vers {0}.old</target>
           <source>Reconnection In Progress</source>
           <target state="final">Reconnexion en cours</target>
         </trans-unit>
-        <trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
-          <source>Try {0} of {1}</source>
-          <target state="final">Essai {0} sur {1}</target>
-        </trans-unit>
         <trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
           <source>Not Connected</source>
           <target state="final">Non connecté</target>
@@ -1832,14 +1828,6 @@ Fichier Ini déplacé vers {0}.old</target>
           <source>Disconnected from Nut Host</source>
           <target state="final">Déconnectée du serveur NUT</target>
         </trans-unit>
-        <trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
-          <source>Try Reconnect {0} / {1}</source>
-          <target state="final">Tentative de reconnexion {0} / {1}</target>
-        </trans-unit>
-        <trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
-          <source>Max Retry reached. Wait for manual Reconnection</source>
-          <target state="final">Nombre maximale d'essai atteint. En attente de reconnexion manuelle</target>
-        </trans-unit>
         <trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
           <source>Conditions met for launching the Extinguishing Process</source>
           <target state="final">Conditions atteintes pour le lancement du Processus d'Extinction</target>

diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf
@@ -636,10 +636,6 @@ Ini File Moved to {0}.old</source>
           <source>Reconnection In Progress</source>
           <target state="final">Переподключение в процессе</target>
         </trans-unit>
-        <trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
-          <source>Try {0} of {1}</source>
-          <target state="final">Попытка {0} из {1}</target>
-        </trans-unit>
         <trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
           <source>Not Connected</source>
           <target state="final">Не подключено</target>
@@ -738,15 +734,6 @@ Cancel to Save Msi and Install Later</source>
           <source>Disconnected from Nut Host</source>
           <target state="final">Отключиться от сервера NUT</target>
         </trans-unit>
-        <trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
-          <source>Try Reconnect {0} / {1}</source>
-          <target state="final">Попытка переподключения {0} / {1}</target>
-        </trans-unit>
-        <trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
-          <source>Max Retry reached. Wait for manual Reconnection</source>
-          <target state="final">Достигнуто макимальное количество попыток повторного подключения.
-Ожидается ручное переподключение</target>
-        </trans-unit>
         <trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
           <source>Conditions met for launching the Extinguishing Process</source>
           <target state="final">Достигнуты условия для запуска процесса отключения</target>

diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.uk-UA.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.uk-UA.xlf
@@ -636,10 +636,6 @@ Ini File Moved to {0}.old</source>
           <source>Reconnection In Progress</source>
           <target state="final">Перепідключення в процесі</target>
         </trans-unit>
-        <trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
-          <source>Try {0} of {1}</source>
-          <target state="final">Спроба {0} из {1}</target>
-        </trans-unit>
         <trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
           <source>Not Connected</source>
           <target state="final">Не підключено</target>
@@ -738,15 +734,6 @@ Cancel to Save Msi and Install Later</source>
           <source>Disconnected from Nut Host</source>
           <target state="final">Від'єднатися від сервера NUT</target>
         </trans-unit>
-        <trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
-          <source>Try Reconnect {0} / {1}</source>
-          <target state="final">Спроба перепідключення {0} / {1}</target>
-        </trans-unit>
-        <trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
-          <source>Max Retry reached. Wait for manual Reconnection</source>
-          <target state="final">Досягнуто макимальної кількості спроб повторного з'єднання.
-Ожидается ручное переподключение</target>
-        </trans-unit>
         <trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
           <source>Conditions met for launching the Extinguishing Process</source>
           <target state="final">Досягнуто умов для запуску процесу вимкнення</target>

diff --git a/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf
@@ -625,10 +625,6 @@ Ini 文件重命名为 {0}.old</target>
           <source>Reconnection In Progress</source>
           <target state="final">重连中</target>
         </trans-unit>
-        <trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
-          <source>Try {0} of {1}</source>
-          <target state="final">尝试 {1} 的 {0}</target>
-        </trans-unit>
         <trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
           <source>Not Connected</source>
           <target state="final">未连接</target>
@@ -719,14 +715,6 @@ Cancel to Save Msi and Install Later</source>
           <source>Disconnected from Nut Host</source>
           <target state="final">从 Nut 主机断开了连接</target>
         </trans-unit>
-        <trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
-          <source>Try Reconnect {0} / {1}</source>
-          <target state="final">尝试重连 {0} / {1}</target>
-        </trans-unit>
-        <trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
-          <source>Max Retry reached. Wait for manual Reconnection</source>
-          <target state="final">达到最大重试次数。等待手动重连。</target>
-        </trans-unit>
         <trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
           <source>Conditions met for launching the Extinguishing Process</source>
           <target state="final">触发关机流程所需满足的条件</target>

diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb b/WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb
diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx
@@ -42,9 +42,6 @@
   <data name="Frm_Main_Str_03" xml:space="preserve">
     <value>Wiederverbindung läuft</value>
   </data>
-  <data name="Frm_Main_Str_04" xml:space="preserve">
-    <value>Versuch {0} von {1}</value>
-  </data>
   <data name="Frm_Main_Str_05" xml:space="preserve">
     <value>Nicht verbunden</value>
   </data>
@@ -75,12 +72,6 @@
   <data name="Log_Str_05" xml:space="preserve">
     <value>Verbindung zum NUT-Host verloren</value>
   </data>
-  <data name="Log_Str_06" xml:space="preserve">
-    <value>Versuche Wiederverbindung {0} / {1}</value>
-  </data>
-  <data name="Log_Str_07" xml:space="preserve">
-    <value>Maximale Anzahl Verbindungsversuche erreicht. Auf manuelle Wiederverbindung warten.</value>
-  </data>
   <data name="Log_Str_08" xml:space="preserve">
     <value>Voraussetzungen für den Start des Löschprozesses liegen vor</value>
   </data>

diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx
@@ -46,9 +46,6 @@ Fichier Ini déplacé vers {0}.old</value>
   <data name="Frm_Main_Str_03" xml:space="preserve">
     <value>Reconnexion en cours</value>
   </data>
-  <data name="Frm_Main_Str_04" xml:space="preserve">
-    <value>Essai {0} sur {1}</value>
-  </data>
   <data name="Frm_Main_Str_05" xml:space="preserve">
     <value>Non connecté</value>
   </data>
@@ -79,12 +76,6 @@ Fichier Ini déplacé vers {0}.old</value>
   <data name="Log_Str_05" xml:space="preserve">
     <value>Déconnectée du serveur NUT</value>
   </data>
-  <data name="Log_Str_06" xml:space="preserve">
-    <value>Tentative de reconnexion {0} / {1}</value>
-  </data>
-  <data name="Log_Str_07" xml:space="preserve">
-    <value>Nombre maximale d'essai atteint. En attente de reconnexion manuelle</value>
-  </data>
   <data name="Log_Str_08" xml:space="preserve">
     <value>Conditions atteintes pour le lancement du Processus d'Extinction</value>
   </data>

diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.resx
@@ -228,9 +228,6 @@ Ini File Moved to {0}.old</value>
   <data name="Frm_Main_Str_03" xml:space="preserve">
     <value>Reconnection In Progress</value>
   </data>
-  <data name="Frm_Main_Str_04" xml:space="preserve">
-    <value>Try {0} of {1}</value>
-  </data>
   <data name="Frm_Main_Str_05" xml:space="preserve">
     <value>Not Connected</value>
   </data>
@@ -306,12 +303,6 @@ Cancel to Save Msi and Install Later</value>
   <data name="Log_Str_05" xml:space="preserve">
     <value>Disconnected from Nut Host</value>
   </data>
-  <data name="Log_Str_06" xml:space="preserve">
-    <value>Try Reconnect {0} / {1}</value>
-  </data>
-  <data name="Log_Str_07" xml:space="preserve">
-    <value>Max Retry reached. Wait for manual Reconnection</value>
-  </data>
   <data name="Log_Str_08" xml:space="preserve">
     <value>Conditions met for launching the Extinguishing Process</value>
   </data>

diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.ru-RU.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.ru-RU.resx
@@ -24,9 +24,6 @@
   <data name="Frm_Main_Str_03" xml:space="preserve">
     <value>Переподключение в процессе</value>
   </data>
-  <data name="Frm_Main_Str_04" xml:space="preserve">
-    <value>Попытка {0} из {1}</value>
-  </data>
   <data name="Frm_Main_Str_05" xml:space="preserve">
     <value>Не подключено</value>
   </data>
@@ -96,13 +93,6 @@
   <data name="Log_Str_05" xml:space="preserve">
     <value>Отключиться от сервера NUT</value>
   </data>
-  <data name="Log_Str_06" xml:space="preserve">
-    <value>Попытка переподключения {0} / {1}</value>
-  </data>
-  <data name="Log_Str_07" xml:space="preserve">
-    <value>Достигнуто макимальное количество попыток повторного подключения.
-Ожидается ручное переподключение</value>
-  </data>
   <data name="Log_Str_08" xml:space="preserve">
     <value>Достигнуты условия для запуска процесса отключения</value>
   </data>

diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.uk-UA.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.uk-UA.resx
@@ -24,9 +24,6 @@
   <data name="Frm_Main_Str_03" xml:space="preserve">
     <value>Перепідключення в процесі</value>
   </data>
-  <data name="Frm_Main_Str_04" xml:space="preserve">
-    <value>Спроба {0} из {1}</value>
-  </data>
   <data name="Frm_Main_Str_05" xml:space="preserve">
     <value>Не підключено</value>
   </data>
@@ -96,13 +93,6 @@
   <data name="Log_Str_05" xml:space="preserve">
     <value>Від'єднатися від сервера NUT</value>
   </data>
-  <data name="Log_Str_06" xml:space="preserve">
-    <value>Спроба перепідключення {0} / {1}</value>
-  </data>
-  <data name="Log_Str_07" xml:space="preserve">
-    <value>Досягнуто макимальної кількості спроб повторного з'єднання.
-Ожидается ручное переподключение</value>
-  </data>
   <data name="Log_Str_08" xml:space="preserve">
     <value>Досягнуто умов для запуску процесу вимкнення</value>
   </data>

diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx
@@ -25,9 +25,6 @@ Ini 文件重命名为 {0}.old</value>
   <data name="Frm_Main_Str_03" xml:space="preserve">
     <value>重连中</value>
   </data>
-  <data name="Frm_Main_Str_04" xml:space="preserve">
-    <value>尝试 {1} 的 {0}</value>
-  </data>
   <data name="Frm_Main_Str_05" xml:space="preserve">
     <value>未连接</value>
   </data>
@@ -91,12 +88,6 @@ Ini 文件重命名为 {0}.old</value>
   <data name="Log_Str_05" xml:space="preserve">
     <value>从 Nut 主机断开了连接</value>
   </data>
-  <data name="Log_Str_06" xml:space="preserve">
-    <value>尝试重连 {0} / {1}</value>
-  </data>
-  <data name="Log_Str_07" xml:space="preserve">
-    <value>达到最大重试次数。等待手动重连。</value>
-  </data>
   <data name="Log_Str_08" xml:space="preserve">
     <value>触发关机流程所需满足的条件</value>
   </data>

diff --git a/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-TW.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-TW.resx
@@ -24,9 +24,6 @@
   <data name="Frm_Main_Str_03" xml:space="preserve">
     <value>正在重新連線</value>
   </data>
-  <data name="Frm_Main_Str_04" xml:space="preserve">
-    <value>重試第 {0} 次，共 {1} 次</value>
-  </data>
   <data name="Frm_Main_Str_05" xml:space="preserve">
     <value>未連線</value>
   </data>
@@ -93,12 +90,6 @@
   <data name="Log_Str_05" xml:space="preserve">
     <value>已與 NUT 伺服器中斷連線。</value>
   </data>
-  <data name="Log_Str_06" xml:space="preserve">
-    <value>重試連線 {0} / {1}</value>
-  </data>
-  <data name="Log_Str_07" xml:space="preserve">
-    <value>已達最大重試次數，等待手動重新連線。</value>
-  </data>
   <data name="Log_Str_08" xml:space="preserve">
     <value>啟動停機程序的條件</value>
   </data>