From 60d05dc23558f7af97d62c26ec2fac02b7d29005 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Thu, 24 Oct 2019 10:08:07 +0200 Subject: [PATCH] fix some log messages --- boswatch/network/client.py | 5 +++-- boswatch/network/server.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boswatch/network/client.py b/boswatch/network/client.py index 7ea1f21..9a530dc 100644 --- a/boswatch/network/client.py +++ b/boswatch/network/client.py @@ -58,6 +58,7 @@ class TCPClient: @return True or False""" try: if self.isConnected: + self._sock.shutdown() self._sock.close() logging.debug("disconnected") return True @@ -94,10 +95,10 @@ class TCPClient: header = self._sock.recv(HEADERSIZE) if not len(header): # check if there data return False - logging.debug("recv header: '%s'", header) + logging.debug("recv header: %s", header) length = int(header.decode("utf-8").strip()) received = self._sock.recv(length).decode("utf-8") - logging.debug("received %d bytes: %s", length, received) + logging.debug("received %d bytes: %s", len(received), received) return received except socket.error as e: logging.error(e) diff --git a/boswatch/network/server.py b/boswatch/network/server.py index 2752b35..3aedd88 100644 --- a/boswatch/network/server.py +++ b/boswatch/network/server.py @@ -57,8 +57,8 @@ class _ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): if data == "": continue - logging.debug("%s recv header: '%s'", req_name, header) - logging.debug("%s recv %d bytes:\n%s", req_name, length, pformat(data)) + logging.debug("%s recv header: %s", req_name, header) + logging.debug("%s recv %d bytes:\n%s", req_name, len(data), pformat(data)) # add a new entry and the decoded data dict as an string in utf-8 and an timestamp self.server.alarmQueue.put_nowait((self.client_address[0], data, time.time())) # queue is threadsafe