diff --git a/src/networkers.py b/src/networkers.py --- a/src/networkers.py +++ b/src/networkers.py @@ -12,9 +12,8 @@ class NetworkReader(threading.Thread): self.output=queue.Queue() def run(self): - while True: - if not self.parent.is_alive(): return - self.output.put(self.readMsg(),timeout=2) + if not self.parent.is_alive(): return + self.output.put(self.readMsg(),timeout=5) def readMsg(self): data=self.stream.readline() @@ -39,14 +38,13 @@ class NetworkWriter(threading.Thread): self.input=queue.Queue() def run(self): - while True: - if not self.parent.is_alive(): return - msg=self.input.get(timeout=2) - if msg is None: return - self.stream.write(self.writeMsg(msg)) - self.stream.flush() + if not self.parent.is_alive(): return + msg=self.input.get(timeout=5) + if msg is None: return + self.stream.write(self.prepMsg(msg)) + self.stream.flush() - def writeMsg(self,msg): + def prepMsg(self, msg): jsonData,binData=msg jsonData=bytes(json.dumps(jsonData)+"\n",encoding="utf-8") jsonLength=bytes("json-length: "+str(len(jsonData))+"\n",encoding="utf-8")