From f88c3ea03f499cc978a2b79a64725940724fb23e Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Wed, 23 Oct 2019 08:10:50 +0200 Subject: [PATCH] improve logging --- boswatch/decoder/fmsDecoder.py | 1 - boswatch/decoder/pocsagDecoder.py | 1 - boswatch/decoder/zveiDecoder.py | 1 - boswatch/network/client.py | 4 +++- boswatch/network/server.py | 4 +++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/boswatch/decoder/fmsDecoder.py b/boswatch/decoder/fmsDecoder.py index 6384295..5836b9d 100644 --- a/boswatch/decoder/fmsDecoder.py +++ b/boswatch/decoder/fmsDecoder.py @@ -62,7 +62,6 @@ class FmsDecoder: bwPacket.set("directionText", directionText) bwPacket.set("tacticalInfo", tacticalInfo) - logging.debug(bwPacket) return bwPacket logging.warning("no valid data") diff --git a/boswatch/decoder/pocsagDecoder.py b/boswatch/decoder/pocsagDecoder.py index fdd7634..d3c674c 100644 --- a/boswatch/decoder/pocsagDecoder.py +++ b/boswatch/decoder/pocsagDecoder.py @@ -56,7 +56,6 @@ class PocsagDecoder: bwPacket.set("subricText", subricText) bwPacket.set("message", message) - logging.debug(bwPacket) return bwPacket logging.warning("no valid data") diff --git a/boswatch/decoder/zveiDecoder.py b/boswatch/decoder/zveiDecoder.py index 6ccd65b..00f21a3 100644 --- a/boswatch/decoder/zveiDecoder.py +++ b/boswatch/decoder/zveiDecoder.py @@ -44,7 +44,6 @@ class ZveiDecoder: bwPacket.set("mode", "zvei") bwPacket.set("zvei", ZveiDecoder._solveDoubleTone(data[7:12])) - logging.debug(bwPacket) return bwPacket logging.warning("no valid data") diff --git a/boswatch/network/client.py b/boswatch/network/client.py index 7c8cd3c..00bead8 100644 --- a/boswatch/network/client.py +++ b/boswatch/network/client.py @@ -17,6 +17,7 @@ import logging import socket import select +from pprint import pformat logging.debug("- %s loaded", __name__) @@ -72,7 +73,7 @@ class TCPClient: @param data: data to send to the server @return True or False""" try: - logging.debug("transmitting: %s", data) + logging.debug("transmitting:\n%s", pformat(data)) header = str(len(data)).ljust(HEADERSIZE) self._sock.sendall(bytes(header + data, "utf-8")) logging.debug("transmitted...") @@ -92,6 +93,7 @@ class TCPClient: header = self._sock.recv(HEADERSIZE) if not len(header): # check if there data return False + 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) diff --git a/boswatch/network/server.py b/boswatch/network/server.py index 6f92846..631a9ac 100644 --- a/boswatch/network/server.py +++ b/boswatch/network/server.py @@ -20,6 +20,7 @@ import socketserver import threading import time import select +from pprint import pformat logging.debug("- %s loaded", __name__) @@ -50,13 +51,14 @@ class _ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): if not len(header): break # empty data -> socked closed + logging.debug("%s recv header: '%s'", req_name, header) length = int(header.decode("utf-8").strip()) data = self.request.recv(length).decode("utf-8") if data == "": continue - logging.debug("%s recv %d bytes: %s", req_name, length, data) + logging.debug("%s recv %d bytes:\n%s", req_name, length, 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