From ea67cc3a518f8bc3ebb10650b5bad4f692d8ad20 Mon Sep 17 00:00:00 2001 From: NaruX Date: Mon, 26 Jun 2017 09:27:49 +0200 Subject: [PATCH] =?UTF-8?q?Exitcode=20angepasst=20f=C3=BCr=20RevPiSlave=20?= =?UTF-8?q?Thread?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- revpipyload/revpipyload.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py index 20ec3e2..2540acd 100755 --- a/revpipyload/revpipyload.py +++ b/revpipyload/revpipyload.py @@ -481,6 +481,7 @@ class RevPiSlave(Thread): super().__init__() self.deadtime = 0.5 self._evt_exit = Event() + self.exitcode = None self.th_dev = [] self.zeroonerror = False self.zeroonexit = False @@ -495,12 +496,14 @@ class RevPiSlave(Thread): self.so.bind(("", 55234)) except: warnings.warn("can not bind socket - retry", Warning) + proginit.logger.warning("can not bind socket - retry") self._evt_exit.wait(1) else: break self.so.listen(15) while not self._evt_exit.is_set(): + self.exitcode = -1 # Verbindung annehmen proginit.logger.debug("accept new connection") @@ -515,9 +518,15 @@ class RevPiSlave(Thread): th.start() self.th_dev.append(th) + # Alle Threads beenden + for th in self.th_dev: + th.stop() + # Socket schließen self.so.close() + self.exitcode = 0 + warnings.resetwarnings() proginit.logger.debug("leave RevPiSlave.run()") def stop(self): @@ -526,10 +535,6 @@ class RevPiSlave(Thread): self._evt_exit.set() self.so.shutdown(socket.SHUT_RDWR) - # Alle Threads beenden - for th in self.th_dev: - th.stop() - proginit.logger.debug("leave RevPiSlave.stop()")