third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-04-28 22:22:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Relay: Add TRACE logging & use in key places

Browse Source 
* Define our own TRACE logging level ('deeper' than DEBUG).
* Define `.trace()` method to use it.
* `logger.trace(...)` for duplicate or 'sent to Listeners' messages.

NB: mypy is still unhappy about Logger.trace, despite attempting the same
   workaround asin EDMC.  Hence the `  # type: ignore` on uses.
This commit is contained in:
Athanasius 2022-08-19 16:25:30 +01:00
parent 58c68ec17e
commit 580160b95b
No known key found for this signature in database
GPG Key ID: 8C392035DD80FD62
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/eddn/Relay.py
View File

@ -10,6 +10,7 @@ import time
import uuid import uuid
import zlib import zlib
from threading import Thread from threading import Thread
from typing import TYPE_CHECKING
if pathlib.Path(sys.path[0]).as_posix().endswith('/eddn'): if pathlib.Path(sys.path[0]).as_posix().endswith('/eddn'):
print(sys.path) print(sys.path)
@ -41,6 +42,23 @@ from zmq import SUB as ZMQ_SUB
from zmq import SUBSCRIBE as ZMQ_SUBSCRIBE from zmq import SUBSCRIBE as ZMQ_SUBSCRIBE
# Logging has to be configured first before we do anything. # Logging has to be configured first before we do anything.
# Define a TRACE level
LEVEL_TRACE = 5
LEVEL_TRACE_ALL = 3
logging.addLevelName(LEVEL_TRACE, "TRACE")
logging.addLevelName(LEVEL_TRACE_ALL, "TRACE_ALL")
logging.TRACE = LEVEL_TRACE # type: ignore
logging.TRACE_ALL = LEVEL_TRACE_ALL # type: ignore
logging.Logger.trace = lambda self, message, *args, **kwargs: self._log( # type: ignore
logging.TRACE, # type: ignore
message,
args,
**kwargs
)
# isort: off
if TYPE_CHECKING:
from logging import trace, TRACE # type: ignore # noqa: F401
# isort: on
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
__logger_channel = logging.StreamHandler() __logger_channel = logging.StreamHandler()
@ -168,6 +186,7 @@ class Relay(Thread):
if duplicate_messages.is_duplicated(json): if duplicate_messages.is_duplicated(json):
# We've already seen this message recently. Discard it. # We've already seen this message recently. Discard it.
stats_collector.tally("duplicate") stats_collector.tally("duplicate")
logger.trace('Discarding duplicate message') # type: ignore
return return
# Mask the uploader with a randomised nonce but still make it unique # Mask the uploader with a randomised nonce but still make it unique
@ -188,6 +207,7 @@ class Relay(Thread):
# Send message # Send message
sender.send(message) sender.send(message)
stats_collector.tally("outbound") stats_collector.tally("outbound")
logger.trace('Sent message to Listeners') # type: ignore
while True: while True:
# For each incoming message, spawn a greenlet using the relay_worker # For each incoming message, spawn a greenlet using the relay_worker