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

Protocol change on flush()

Browse Source
This commit is contained in:
Sven Sager
2020-03-17 20:21:31 +01:00
parent 245a5ac5cf
commit 7fd4b01b57
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
revpimodio2/netio.py
View File

@@ -258,6 +258,9 @@ class NetFH(Thread):
"""
Entfernt die konfigurierten Dirtybytes vom RevPi Slave.
Diese Funktion wirft keine Exception bei einem uebertragungsfehler,
veranlasst aber eine Neuverbindung.
:param position: Startposition der Dirtybytes
"""
if self.__config_changed:
@@ -335,7 +338,7 @@ class NetFH(Thread):
# b CM ii ii 00000000 b = 16
self._slavesock.sendall(pack(
"=c2sHH8xc",
HEADER_START, b'FD', len(self.__by_buff), self.__int_buff, HEADER_STOP
HEADER_START, b'FD', self.__int_buff, len(self.__by_buff), HEADER_STOP
) + self.__by_buff)
# Puffer immer leeren
@@ -484,17 +487,17 @@ class NetFH(Thread):
self.__buff_block, recv_lenght
)
if count == 0:
raise IOError("readpictory error on network")
raise IOError("readpictory length error on network")
self.__buff_recv += self.__buff_block[:count]
recv_lenght -= count
recv_lenght = unpack("=I", self.__buff_recv)[0]
recv_lenght, = unpack("=I", self.__buff_recv)
while recv_lenght > 0:
count = self._slavesock.recv_into(
self.__buff_block, min(recv_lenght, self.__buff_size)
)
if count == 0:
raise IOError("readpictory error on network")
raise IOError("readpictory file error on network")
self.__buff_recv += self.__buff_block[:count]
recv_lenght -= count
@@ -524,17 +527,17 @@ class NetFH(Thread):
self.__buff_block, recv_lenght
)
if count == 0:
raise IOError("readreplaceio error on network")
raise IOError("readreplaceio length error on network")
self.__buff_recv += self.__buff_block[:count]
recv_lenght -= count
recv_lenght = unpack("=I", self.__buff_recv)[0]
recv_lenght, = unpack("=I", self.__buff_recv)
while recv_lenght > 0:
count = self._slavesock.recv_into(
self.__buff_block, min(recv_lenght, self.__buff_size)
)
if count == 0:
raise IOError("readpictory error on network")
raise IOError("readreplaceio file error on network")
self.__buff_recv += self.__buff_block[:count]
recv_lenght -= count
@@ -610,6 +613,9 @@ class NetFH(Thread):
"""
Konfiguriert Dirtybytes fuer Prozessabbild bei Verbindungsfehler.
Diese Funktion wirft keine Exception bei einem uebertragungsfehler,
veranlasst aber eine Neuverbindung.
:param position: Startposition zum Schreiben
:param dirtybytes: <class 'bytes'> die geschrieben werden sollen
"""