# HG changeset patch # User andrey@new-nest # Date 1462562482 -10800 # Node ID 9db0b436fbb3a531ac447e26fd77d73f8b1ee702 # Parent da8bf5aa275f498fe1da0c8c85ae52e178752a67 fix bug: Beremiz IDE hangs during launching Beremiz_service this is regression introduced as side effect by d7f474d [fix issue with sometimes wrong return code of ProcessLogger] diff -r da8bf5aa275f -r 9db0b436fbb3 util/ProcessLogger.py --- a/util/ProcessLogger.py Fri May 06 19:14:10 2016 +0300 +++ b/util/ProcessLogger.py Fri May 06 22:21:22 2016 +0300 @@ -175,6 +175,7 @@ self.log_the_end(ecode,pid) if self.finish_callback is not None: self.finish_callback(self,ecode,pid) + self.errt.join() self.finishsem.release() def kill(self,gently=True): @@ -199,14 +200,12 @@ def endlog(self): if self.endlock.acquire(False): - self.finishsem.release() if not self.outt.finished and self.kill_it: self.kill() + self.finishsem.release() def spin(self): self.finishsem.acquire() - self.outt.join() - self.errt.join() return [self.exitcode, "".join(self.outdata), "".join(self.errdata)]