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

Mit warnings zusammenführen

Browse Source
This commit is contained in:
Sven Sager
2019-09-05 13:12:54 +02:00
parent 56b7c252b6 182904f3ac
commit 67f89ff2f3
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
revpimodio2/netio.py
View File

@@ -509,26 +509,25 @@ class NetFH(Thread):
RuntimeWarning
)
else:
# Kein Fehler aufgetreten, sync durchführen wenn socket frei
if not self.__trigger and \
self.__socklock.acquire(blocking=False):
try:
self._slavesock.send(_syssync)
data = self._slavesock.recv(2)
except IOError:
# Kein Fehler aufgetreten, sync durchführen wenn socket frei
if not self.__trigger and \
self.__socklock.acquire(blocking=False):
try:
self._slavesock.send(_syssync)
data = self._slavesock.recv(2)
except IOError:
self.__sockerr.set()
else:
if data != b'\x06\x16':
warnings.warn(
"data error on network sync",
RuntimeWarning
)
self.__sockerr.set()
else:
if data != b'\x06\x16':
warnings.warn(
"data error on network sync",
RuntimeWarning
)
self.__sockerr.set()
self.__socklock.release()
self.__socklock.release()
self.__trigger = False
self.__trigger = False
# Warten nach Sync damit Instantiierung funktioniert
self.__sockerr.wait(self.__waitsync)