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

Mit net zusammenführen

Browse Source
This commit is contained in:
Sven Sager
2019-09-05 13:04:04 +02:00
parent 7c279a71a1 4b8ae9926e
commit 182904f3ac
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
revpimodio2/netio.py
View File

@@ -495,29 +495,29 @@ class NetFH(Thread):
if self.__sockerr.is_set(): if self.__sockerr.is_set():
# Verhindert bei Scheitern 100% CPU last # Verhindert bei Scheitern 100% CPU last
self.__sockend.wait(self.__waitsync) self.__sockend.wait(self.__waitsync)
continue
else: # Kein Fehler aufgetreten, sync durchführen wenn socket frei
# Kein Fehler aufgetreten, sync durchführen wenn socket frei if not self.__trigger and \
if not self.__trigger and \ self.__socklock.acquire(blocking=False):
self.__socklock.acquire(blocking=False): try:
try: self._slavesock.send(_syssync)
self._slavesock.send(_syssync) data = self._slavesock.recv(2)
data = self._slavesock.recv(2) except IOError as e:
except IOError as e: warnings.warn(
"network error in sync of NetFH", RuntimeWarning
)
self.__sockerr.set()
else:
if data != b'\x06\x16':
warnings.warn( warnings.warn(
"network error in sync of NetFH", RuntimeWarning "data error in sync of NetFH", RuntimeWarning
) )
self.__sockerr.set() self.__sockerr.set()
else:
if data != b'\x06\x16':
warnings.warn(
"data error in sync of NetFH", RuntimeWarning
)
self.__sockerr.set()
self.__socklock.release() self.__socklock.release()
self.__trigger = False self.__trigger = False
# Warten nach Sync damit Instantiierung funktioniert # Warten nach Sync damit Instantiierung funktioniert
self.__sockerr.wait(self.__waitsync) self.__sockerr.wait(self.__waitsync)