BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2026-04-20 05:33:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

improve logging

Browse source
This commit is contained in:
Bastian Schroll 2019-10-23 08:10:50 +02:00
parent 3cdd0297dd
commit f88c3ea03f
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boswatch/decoder/fmsDecoder.py
View file

@ -62,7 +62,6 @@ class FmsDecoder:
bwPacket.set("directionText", directionText) bwPacket.set("directionText", directionText)
bwPacket.set("tacticalInfo", tacticalInfo) bwPacket.set("tacticalInfo", tacticalInfo)
logging.debug(bwPacket)
return bwPacket return bwPacket
logging.warning("no valid data") logging.warning("no valid data")

1
boswatch/decoder/pocsagDecoder.py
View file

@ -56,7 +56,6 @@ class PocsagDecoder:
bwPacket.set("subricText", subricText) bwPacket.set("subricText", subricText)
bwPacket.set("message", message) bwPacket.set("message", message)
logging.debug(bwPacket)
return bwPacket return bwPacket
logging.warning("no valid data") logging.warning("no valid data")

1
boswatch/decoder/zveiDecoder.py
View file

@ -44,7 +44,6 @@ class ZveiDecoder:
bwPacket.set("mode", "zvei") bwPacket.set("mode", "zvei")
bwPacket.set("zvei", ZveiDecoder._solveDoubleTone(data[7:12])) bwPacket.set("zvei", ZveiDecoder._solveDoubleTone(data[7:12]))
logging.debug(bwPacket)
return bwPacket return bwPacket
logging.warning("no valid data") logging.warning("no valid data")

4
boswatch/network/client.py
View file

@ -17,6 +17,7 @@
import logging import logging
import socket import socket
import select import select
from pprint import pformat
logging.debug("- %s loaded", __name__) logging.debug("- %s loaded", __name__)
@ -72,7 +73,7 @@ class TCPClient:
@param data: data to send to the server @param data: data to send to the server
@return True or False""" @return True or False"""
try: try:
logging.debug("transmitting: %s", data) logging.debug("transmitting:\n%s", pformat(data))
header = str(len(data)).ljust(HEADERSIZE) header = str(len(data)).ljust(HEADERSIZE)
self._sock.sendall(bytes(header + data, "utf-8")) self._sock.sendall(bytes(header + data, "utf-8"))
logging.debug("transmitted...") logging.debug("transmitted...")
@ -92,6 +93,7 @@ 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)
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", length, received)

4
boswatch/network/server.py
View file

@ -20,6 +20,7 @@ import socketserver
import threading import threading
import time import time
import select import select
from pprint import pformat
logging.debug("- %s loaded", __name__) logging.debug("- %s loaded", __name__)
@ -50,13 +51,14 @@ class _ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
if not len(header): if not len(header):
break # empty data -> socked closed break # empty data -> socked closed
logging.debug("%s recv header: '%s'", req_name, header)
length = int(header.decode("utf-8").strip()) length = int(header.decode("utf-8").strip())
data = self.request.recv(length).decode("utf-8") data = self.request.recv(length).decode("utf-8")
if data == "<alive>": if data == "<alive>":
continue 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 # 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