Skip to content

Commit 886613f

Browse files
gbakemangbakeman
committed
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
1 parent 25a7284 commit 886613f

17 files changed

+33
-218
lines changed

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-Client.zh-TW.xlf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,6 @@ Ini File Moved to {0}.old</source>
635635
<source>Reconnection In Progress</source>
636636
<target state="translated">正在重新連線</target>
637637
</trans-unit>
638-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
639-
<source>Try {0} of {1}</source>
640-
<target state="translated">重試第 {0} 次，共 {1} 次</target>
641-
</trans-unit>
642638
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
643639
<source>Not Connected</source>
644640
<target state="translated">未連線</target>
@@ -734,14 +730,6 @@ Cancel to Save Msi and Install Later</source>
734730
<source>Disconnected from Nut Host</source>
735731
<target state="translated">已與 NUT 伺服器中斷連線。</target>
736732
</trans-unit>
737-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
738-
<source>Try Reconnect {0} / {1}</source>
739-
<target state="translated">重試連線 {0} / {1}</target>
740-
</trans-unit>
741-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
742-
<source>Max Retry reached. Wait for manual Reconnection</source>
743-
<target state="translated">已達最大重試次數，等待手動重新連線。</target>
744-
</trans-unit>
745733
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
746734
<source>Conditions met for launching the Extinguishing Process</source>
747735
<target state="translated">啟動停機程序的條件</target>

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,10 +1764,6 @@ Ini File Moved to {0}.old</source>
17641764
<source>Reconnection In Progress</source>
17651765
<target state="final">Wiederverbindung läuft</target>
17661766
</trans-unit>
1767-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
1768-
<source>Try {0} of {1}</source>
1769-
<target state="translated">Versuch {0} von {1}</target>
1770-
</trans-unit>
17711767
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
17721768
<source>Not Connected</source>
17731769
<target state="final">Nicht verbunden</target>
@@ -1808,14 +1804,6 @@ Ini File Moved to {0}.old</source>
18081804
<source>Disconnected from Nut Host</source>
18091805
<target state="translated">Verbindung zum NUT-Host verloren</target>
18101806
</trans-unit>
1811-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
1812-
<source>Try Reconnect {0} / {1}</source>
1813-
<target state="translated">Versuche Wiederverbindung {0} / {1}</target>
1814-
</trans-unit>
1815-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
1816-
<source>Max Retry reached. Wait for manual Reconnection</source>
1817-
<target state="translated">Maximale Anzahl Verbindungsversuche erreicht. Auf manuelle Wiederverbindung warten.</target>
1818-
</trans-unit>
18191807
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
18201808
<source>Conditions met for launching the Extinguishing Process</source>
18211809
<target state="translated">Voraussetzungen für den Start des Löschprozesses liegen vor</target>

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,10 +1788,6 @@ Fichier Ini déplacé vers {0}.old</target>
17881788
<source>Reconnection In Progress</source>
17891789
<target state="final">Reconnexion en cours</target>
17901790
</trans-unit>
1791-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
1792-
<source>Try {0} of {1}</source>
1793-
<target state="final">Essai {0} sur {1}</target>
1794-
</trans-unit>
17951791
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
17961792
<source>Not Connected</source>
17971793
<target state="final">Non connecté</target>
@@ -1832,14 +1828,6 @@ Fichier Ini déplacé vers {0}.old</target>
18321828
<source>Disconnected from Nut Host</source>
18331829
<target state="final">Déconnectée du serveur NUT</target>
18341830
</trans-unit>
1835-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
1836-
<source>Try Reconnect {0} / {1}</source>
1837-
<target state="final">Tentative de reconnexion {0} / {1}</target>
1838-
</trans-unit>
1839-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
1840-
<source>Max Retry reached. Wait for manual Reconnection</source>
1841-
<target state="final">Nombre maximale d'essai atteint. En attente de reconnexion manuelle</target>
1842-
</trans-unit>
18431831
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
18441832
<source>Conditions met for launching the Extinguishing Process</source>
18451833
<target state="final">Conditions atteintes pour le lancement du Processus d'Extinction</target>

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -636,10 +636,6 @@ Ini File Moved to {0}.old</source>
636636
<source>Reconnection In Progress</source>
637637
<target state="final">Переподключение в процессе</target>
638638
</trans-unit>
639-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
640-
<source>Try {0} of {1}</source>
641-
<target state="final">Попытка {0} из {1}</target>
642-
</trans-unit>
643639
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
644640
<source>Not Connected</source>
645641
<target state="final">Не подключено</target>
@@ -738,15 +734,6 @@ Cancel to Save Msi and Install Later</source>
738734
<source>Disconnected from Nut Host</source>
739735
<target state="final">Отключиться от сервера NUT</target>
740736
</trans-unit>
741-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
742-
<source>Try Reconnect {0} / {1}</source>
743-
<target state="final">Попытка переподключения {0} / {1}</target>
744-
</trans-unit>
745-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
746-
<source>Max Retry reached. Wait for manual Reconnection</source>
747-
<target state="final">Достигнуто макимальное количество попыток повторного подключения.
748-
Ожидается ручное переподключение</target>
749-
</trans-unit>
750737
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
751738
<source>Conditions met for launching the Extinguishing Process</source>
752739
<target state="final">Достигнуты условия для запуска процесса отключения</target>

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.uk-UA.xlf‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -636,10 +636,6 @@ Ini File Moved to {0}.old</source>
636636
<source>Reconnection In Progress</source>
637637
<target state="final">Перепідключення в процесі</target>
638638
</trans-unit>
639-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
640-
<source>Try {0} of {1}</source>
641-
<target state="final">Спроба {0} из {1}</target>
642-
</trans-unit>
643639
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
644640
<source>Not Connected</source>
645641
<target state="final">Не підключено</target>
@@ -738,15 +734,6 @@ Cancel to Save Msi and Install Later</source>
738734
<source>Disconnected from Nut Host</source>
739735
<target state="final">Від'єднатися від сервера NUT</target>
740736
</trans-unit>
741-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
742-
<source>Try Reconnect {0} / {1}</source>
743-
<target state="final">Спроба перепідключення {0} / {1}</target>
744-
</trans-unit>
745-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
746-
<source>Max Retry reached. Wait for manual Reconnection</source>
747-
<target state="final">Досягнуто макимальної кількості спроб повторного з'єднання.
748-
Ожидается ручное переподключение</target>
749-
</trans-unit>
750737
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
751738
<source>Conditions met for launching the Extinguishing Process</source>
752739
<target state="final">Досягнуто умов для запуску процесу вимкнення</target>

‎WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -625,10 +625,6 @@ Ini 文件重命名为 {0}.old</target>
625625
<source>Reconnection In Progress</source>
626626
<target state="final">重连中</target>
627627
</trans-unit>
628-
<trans-unit id="Frm_Main_Str_04" translate="yes" xml:space="preserve">
629-
<source>Try {0} of {1}</source>
630-
<target state="final">尝试 {1} 的 {0}</target>
631-
</trans-unit>
632628
<trans-unit id="Frm_Main_Str_05" translate="yes" xml:space="preserve">
633629
<source>Not Connected</source>
634630
<target state="final">未连接</target>
@@ -719,14 +715,6 @@ Cancel to Save Msi and Install Later</source>
719715
<source>Disconnected from Nut Host</source>
720716
<target state="final">从 Nut 主机断开了连接</target>
721717
</trans-unit>
722-
<trans-unit id="Log_Str_06" translate="yes" xml:space="preserve">
723-
<source>Try Reconnect {0} / {1}</source>
724-
<target state="final">尝试重连 {0} / {1}</target>
725-
</trans-unit>
726-
<trans-unit id="Log_Str_07" translate="yes" xml:space="preserve">
727-
<source>Max Retry reached. Wait for manual Reconnection</source>
728-
<target state="final">达到最大重试次数。等待手动重连。</target>
729-
</trans-unit>
730718
<trans-unit id="Log_Str_08" translate="yes" xml:space="preserve">
731719
<source>Conditions met for launching the Extinguishing Process</source>
732720
<target state="final">触发关机流程所需满足的条件</target>

‎WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb‎

Lines changed: 0 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
<data name="Frm_Main_Str_03" xml:space="preserve">
4343
<value>Wiederverbindung läuft</value>
4444
</data>
45-
<data name="Frm_Main_Str_04" xml:space="preserve">
46-
<value>Versuch {0} von {1}</value>
47-
</data>
4845
<data name="Frm_Main_Str_05" xml:space="preserve">
4946
<value>Nicht verbunden</value>
5047
</data>
@@ -75,12 +72,6 @@
7572
<data name="Log_Str_05" xml:space="preserve">
7673
<value>Verbindung zum NUT-Host verloren</value>
7774
</data>
78-
<data name="Log_Str_06" xml:space="preserve">
79-
<value>Versuche Wiederverbindung {0} / {1}</value>
80-
</data>
81-
<data name="Log_Str_07" xml:space="preserve">
82-
<value>Maximale Anzahl Verbindungsversuche erreicht. Auf manuelle Wiederverbindung warten.</value>
83-
</data>
8475
<data name="Log_Str_08" xml:space="preserve">
8576
<value>Voraussetzungen für den Start des Löschprozesses liegen vor</value>
8677
</data>

‎WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ Fichier Ini déplacé vers {0}.old</value>
4646
<data name="Frm_Main_Str_03" xml:space="preserve">
4747
<value>Reconnexion en cours</value>
4848
</data>
49-
<data name="Frm_Main_Str_04" xml:space="preserve">
50-
<value>Essai {0} sur {1}</value>
51-
</data>
5249
<data name="Frm_Main_Str_05" xml:space="preserve">
5350
<value>Non connecté</value>
5451
</data>
@@ -79,12 +76,6 @@ Fichier Ini déplacé vers {0}.old</value>
7976
<data name="Log_Str_05" xml:space="preserve">
8077
<value>Déconnectée du serveur NUT</value>
8178
</data>
82-
<data name="Log_Str_06" xml:space="preserve">
83-
<value>Tentative de reconnexion {0} / {1}</value>
84-
</data>
85-
<data name="Log_Str_07" xml:space="preserve">
86-
<value>Nombre maximale d'essai atteint. En attente de reconnexion manuelle</value>
87-
</data>
8879
<data name="Log_Str_08" xml:space="preserve">
8980
<value>Conditions atteintes pour le lancement du Processus d'Extinction</value>
9081
</data>

‎WinNUT_V2/WinNUT-Client/My Project/Resources.resx‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,6 @@ Ini File Moved to {0}.old</value>
228228
<data name="Frm_Main_Str_03" xml:space="preserve">
229229
<value>Reconnection In Progress</value>
230230
</data>
231-
<data name="Frm_Main_Str_04" xml:space="preserve">
232-
<value>Try {0} of {1}</value>
233-
</data>
234231
<data name="Frm_Main_Str_05" xml:space="preserve">
235232
<value>Not Connected</value>
236233
</data>
@@ -306,12 +303,6 @@ Cancel to Save Msi and Install Later</value>
306303
<data name="Log_Str_05" xml:space="preserve">
307304
<value>Disconnected from Nut Host</value>
308305
</data>
309-
<data name="Log_Str_06" xml:space="preserve">
310-
<value>Try Reconnect {0} / {1}</value>
311-
</data>
312-
<data name="Log_Str_07" xml:space="preserve">
313-
<value>Max Retry reached. Wait for manual Reconnection</value>
314-
</data>
315306
<data name="Log_Str_08" xml:space="preserve">
316307
<value>Conditions met for launching the Extinguishing Process</value>
317308
</data>

0 commit comments

Comments
 (0)