From e97b97640b53e51ff552355e8dc31bfe75645426 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sun, 9 Sep 2018 16:16:55 +0200 Subject: [PATCH] little changes in server --- boswatch/network/server.py | 4 ++-- test/test_ServerClient.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boswatch/network/server.py b/boswatch/network/server.py index cb9a1e3..6fc8d33 100644 --- a/boswatch/network/server.py +++ b/boswatch/network/server.py @@ -94,7 +94,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer): self._server = socketserver.ThreadingTCPServer(("", port), TCPHandler) self._server.timeout = self._timeout - self.flushData() + self.flushQueue() self._server_thread = threading.Thread(target=self._server.serve_forever) self._server_thread.name = "Thread-BWServer" @@ -160,7 +160,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer): return len(_dataPackets) # no lock needed - only reading @staticmethod - def flushData(): + def flushQueue(): """!To flush all existing data in queue""" logging.debug("Flush data queue") with _lockDataPackets: diff --git a/test/test_ServerClient.py b/test/test_ServerClient.py index 44080b2..3dbf0fa 100644 --- a/test/test_ServerClient.py +++ b/test/test_ServerClient.py @@ -147,7 +147,7 @@ class Test_ServerClient: self.testClient2 = TCPClient() assert self.testClient2.connect() # send all - useServer.flushData() + useServer.flushQueue() assert self.testClient1.transmit("test1") time.sleep(0.1) # wait for recv to prevent fail of false order assert self.testClient2.transmit("test2")