From 0e8c0a73abcdfe71b393bc9c4f9fa46346714b2a Mon Sep 17 00:00:00 2001 From: NaruX Date: Fri, 31 Mar 2017 15:19:57 +0200 Subject: [PATCH] =?UTF-8?q?logger=20Meldungen=20hinzugef=C3=BCgt=20Zeitmes?= =?UTF-8?q?sung=20verbessert,=20nimmt=20nur=20eigentliche=20Laufzeit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- revpipyload/revpipyload.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py index 5a0d8e8..5ed7c6a 100755 --- a/revpipyload/revpipyload.py +++ b/revpipyload/revpipyload.py @@ -501,7 +501,7 @@ class RevPiSlave(Thread): while not self._evt_exit.is_set(): # Verbindung annehmen - proginit.logger.info("starte accept") + proginit.logger.debug("accept new connection") try: tup_sock = self.so.accept() except: @@ -545,14 +545,15 @@ class RevPiSlaveDev(Thread): self._lenvalw = 0 def run(self): + proginit.logger.debug("enter RevPiSlaveDev.run()") + msgcli = [b'DATA', b'PICT', b'SEND', b'CONF'] + proginit.logger.info("connected from {}".format(self._addr)) # Prozessabbild öffnen fh_proc = open(procimg, "r+b", 0) while not self._evt_exit.is_set(): - ot = default_timer() - # Meldung erhalten try: netcmd = self._devcon.recv(4) @@ -560,6 +561,9 @@ class RevPiSlaveDev(Thread): except: break + # Laufzeitberechnung starten + ot = default_timer() + # Wenn Meldung ungültig ist aussteigen if netcmd not in msgcli: break @@ -637,11 +641,18 @@ class RevPiSlaveDev(Thread): self._devcon.close() self._devcon = None + proginit.logger.info("disconnected from {}".format(self._addr)) + proginit.logger.debug("leave RevPiSlaveDev.run()") + def stop(self): + proginit.logger.debug("enter RevPiSlaveDev.stop()") + self._evt_exit.set() if self._devcon is not None: self._devcon.shutdown(socket.SHUT_RDWR) + proginit.logger.debug("leave RevPiSlaveDev.stop()") + class RevPiPyLoad():