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

Use cm.call_remote_function to fetch log files via XML-RPC

Browse Source
This commit is contained in:
Sven Sager
2023-01-06 17:05:12 +01:00
parent dee2da0d8c
commit da5d0a4a59
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/revpicommander/revpilogfile.py
View File

@@ -27,7 +27,6 @@ class DataThread(QtCore.QThread):
def __init__(self, parent=None, cycle_time=1000): def __init__(self, parent=None, cycle_time=1000):
super(DataThread, self).__init__(parent) super(DataThread, self).__init__(parent)
self._cli = helper.cm.get_cli()
self._cycle_time = cycle_time self._cycle_time = cycle_time
self._paused = True self._paused = True
self.error_count = 0 self.error_count = 0
@@ -45,7 +44,12 @@ class DataThread(QtCore.QThread):
:return: tuple(position: int, EOF: bool) :return: tuple(position: int, EOF: bool)
""" """
# Load max data from start position # Load max data from start position
buff_log = xmlcall(start_position, self.max_block).data # type: bytes buff_log = helper.cm.call_remote_function(
xmlcall,
start_position,
self.max_block,
raise_exception=True
).data # type: bytes
eof = True eof = True
if buff_log == b'\x16': # 'ESC' if buff_log == b'\x16': # 'ESC'
@@ -86,13 +90,13 @@ class DataThread(QtCore.QThread):
while not (eof_app or self.isInterruptionRequested()): while not (eof_app or self.isInterruptionRequested()):
self.mrk_app, eof_app = self._load_log( self.mrk_app, eof_app = self._load_log(
LogType.APP, LogType.APP,
self._cli.load_applog, "load_applog",
self.mrk_app, self.mrk_app,
) )
while not (eof_daemon or self.isInterruptionRequested()): while not (eof_daemon or self.isInterruptionRequested()):
self.mrk_daemon, eof_daemon = self._load_log( self.mrk_daemon, eof_daemon = self._load_log(
LogType.DAEMON, LogType.DAEMON,
self._cli.load_plclog, "load_plclog",
self.mrk_daemon, self.mrk_daemon,
) )
self.error_count = 0 self.error_count = 0