revpi/revpicommander
1
0
Fork 0
mirror of https://github.com/naruxde/revpicommander.git synced 2025-11-08 16:43:53 +01:00
Code Issues Packages Releases Wiki Activity

fix: Signal connection_recovered when connected via XML-RPC native

Browse Source 
The signal 'connection_recovered' was only sent when reconnecting SSH
connections. Now it is also sent after error if the connection is
via the native XML RPC.
This commit is contained in:
Sven Sager
2023-10-26 09:03:28 +02:00
parent 6984945a30
commit a24035be0f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/revpicommander/helper.py
View File

@@ -225,6 +225,7 @@ class ConnectionManager(QtCore.QThread):
self._cli = None self._cli = None
self._cli_connect = Queue() self._cli_connect = Queue()
self._cycle_time = cycle_time_ms self._cycle_time = cycle_time_ms
self._has_error = False
self._lck_cli = Lock() self._lck_cli = Lock()
self._ps_started = False self._ps_started = False
self._revpi = None self._revpi = None
@@ -565,6 +566,7 @@ class ConnectionManager(QtCore.QThread):
except Exception as e: except Exception as e:
log.warning(e) log.warning(e)
self.status_changed.emit(self.tr("SERVER ERROR"), "red") self.status_changed.emit(self.tr("SERVER ERROR"), "red")
self._has_error = True
self.connection_error_observed.emit("{0} | {1}".format(e, type(e))) self.connection_error_observed.emit("{0} | {1}".format(e, type(e)))
if self.ssh_tunnel_server and not self.ssh_tunnel_server.connected: if self.ssh_tunnel_server and not self.ssh_tunnel_server.connected:
@@ -588,6 +590,10 @@ class ConnectionManager(QtCore.QThread):
pass pass
else: else:
if self._has_error:
self._has_error = False
self.connection_recovered.emit()
if plc_exit_code == -1: if plc_exit_code == -1:
self.status_changed.emit(self.tr("RUNNING"), "green") self.status_changed.emit(self.tr("RUNNING"), "green")
elif plc_exit_code == -2: elif plc_exit_code == -2:
@@ -641,6 +647,7 @@ class ConnectionManager(QtCore.QThread):
if reload_funcs: if reload_funcs:
self.xml_funcs = self._cli.system.listMethods() self.xml_funcs = self._cli.system.listMethods()
except Exception as e: except Exception as e:
self._has_error = True
log.error(e) log.error(e)
if raise_exception: if raise_exception:
self._lck_cli.release() self._lck_cli.release()