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

logger Meldungen hinzugefügt

Browse Source 
Zeitmessung verbessert, nimmt nur eigentliche Laufzeit
This commit is contained in:
Sven Sager
2017-03-31 15:19:57 +02:00
parent 0aee4e04d1
commit 0e8c0a73ab
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
revpipyload/revpipyload.py
View File

@@ -501,7 +501,7 @@ class RevPiSlave(Thread):
while not self._evt_exit.is_set(): while not self._evt_exit.is_set():
# Verbindung annehmen # Verbindung annehmen
proginit.logger.info("starte accept") proginit.logger.debug("accept new connection")
try: try:
tup_sock = self.so.accept() tup_sock = self.so.accept()
except: except:
@@ -545,14 +545,15 @@ class RevPiSlaveDev(Thread):
self._lenvalw = 0 self._lenvalw = 0
def run(self): def run(self):
proginit.logger.debug("enter RevPiSlaveDev.run()")
msgcli = [b'DATA', b'PICT', b'SEND', b'CONF'] msgcli = [b'DATA', b'PICT', b'SEND', b'CONF']
proginit.logger.info("connected from {}".format(self._addr))
# Prozessabbild öffnen # Prozessabbild öffnen
fh_proc = open(procimg, "r+b", 0) fh_proc = open(procimg, "r+b", 0)
while not self._evt_exit.is_set(): while not self._evt_exit.is_set():
ot = default_timer()
# Meldung erhalten # Meldung erhalten
try: try:
netcmd = self._devcon.recv(4) netcmd = self._devcon.recv(4)
@@ -560,6 +561,9 @@ class RevPiSlaveDev(Thread):
except: except:
break break
# Laufzeitberechnung starten
ot = default_timer()
# Wenn Meldung ungültig ist aussteigen # Wenn Meldung ungültig ist aussteigen
if netcmd not in msgcli: if netcmd not in msgcli:
break break
@@ -637,11 +641,18 @@ class RevPiSlaveDev(Thread):
self._devcon.close() self._devcon.close()
self._devcon = None self._devcon = None
proginit.logger.info("disconnected from {}".format(self._addr))
proginit.logger.debug("leave RevPiSlaveDev.run()")
def stop(self): def stop(self):
proginit.logger.debug("enter RevPiSlaveDev.stop()")
self._evt_exit.set() self._evt_exit.set()
if self._devcon is not None: if self._devcon is not None:
self._devcon.shutdown(socket.SHUT_RDWR) self._devcon.shutdown(socket.SHUT_RDWR)
proginit.logger.debug("leave RevPiSlaveDev.stop()")
class RevPiPyLoad(): class RevPiPyLoad():