BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2026-04-02 02:54:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some log messages

Browse source
This commit is contained in:
Bastian Schroll 2019-10-24 10:08:07 +02:00
parent a3494b54a6
commit 60d05dc235
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boswatch/network/client.py
View file

@ -58,6 +58,7 @@ class TCPClient:
@return True or False""" @return True or False"""
try: try:
if self.isConnected: if self.isConnected:
self._sock.shutdown()
self._sock.close() self._sock.close()
logging.debug("disconnected") logging.debug("disconnected")
return True return True
@ -94,10 +95,10 @@ class TCPClient:
header = self._sock.recv(HEADERSIZE) header = self._sock.recv(HEADERSIZE)
if not len(header): # check if there data if not len(header): # check if there data
return False return False
logging.debug("recv header: '%s'", header) logging.debug("recv header: %s", header)
length = int(header.decode("utf-8").strip()) length = int(header.decode("utf-8").strip())
received = self._sock.recv(length).decode("utf-8") 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 return received
except socket.error as e: except socket.error as e:
logging.error(e) logging.error(e)

4
boswatch/network/server.py
View file

@ -57,8 +57,8 @@ class _ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
if data == "<keep-alive>": if data == "<keep-alive>":
continue continue
logging.debug("%s recv header: '%s'", req_name, header) 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 %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 # 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 self.server.alarmQueue.put_nowait((self.client_address[0], data, time.time())) # queue is threadsafe