clevermicro/amq-adapter-python
14
0
Fork 0
Code Issues 16 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

#40 - ensure the JSON format is handled correctly at all levels
Unit test coverage / pytest (push) Failing after 1m1s
Details
Unit test coverage / pytest (pull_request) Failing after 1m18s
Details

Browse Source
This commit is contained in:
Stanislav Hejny
2025-05-07 13:05:04 +01:00
parent c862b3cc77
commit 5bb6597b57
9 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amqp/adapter/logging_utils.py
+17 -14
View File
@@ -4,8 +4,11 @@ import os
import sys
import threading
import traceback
from importlib.metadata import version
verbose = os.environ.get("AMQ_VERBOSE_LOGGING", "0") == "1"
# Get version from installed package metadata
__version__ = version("amq_adapter") # Name must match pyproject.toml [project] name
__verbose__ = os.environ.get("AMQ_VERBOSE_LOGGING", "0") == "1"
def get_context_info():
@@ -51,18 +54,18 @@ def logging_error(msg: str, *args) -> None:
if _exec_info:
_tb = traceback.extract_tb(sys.exc_info()[2])[-1]
logging.error(
f"{_thread_id} [E] '{msg}' ---> '{_tb.filename}':{_tb.lineno}, '{_tb.name}()'",
f"{_thread_id}:{__version__} [E] '{msg}' ---> '{_tb.filename}':{_tb.lineno}, '{_tb.name}()'",
*args,
)
else:
module, line_number, function_name = get_context_info()
if module and line_number and function_name:
logging.error(
f"{_thread_id} [E] '{msg}' ---> '{module}':{line_number}, '{function_name}()'",
f"{_thread_id}:{__version__} [E] '{msg}' ---> '{module}':{line_number}, '{function_name}()'",
*args,
)
else:
logging.error(f"{_thread_id} [E] {msg}", *args)
logging.error(f"{_thread_id}:{__version__} [E] {msg}", *args)
def logging_warning(msg: str, *args) -> None:
@@ -73,17 +76,17 @@ def logging_warning(msg: str, *args) -> None:
msg (str): The warning message to log.
"""
_thread_id = threading.get_ident()
if not verbose:
logging.warning(f"{_thread_id} [W] {msg}", *args)
if not __verbose__:
logging.warning(f"{_thread_id}:{__version__} [W] {msg}", *args)
return
module, line_number, function_name = get_context_info()
if module and line_number and function_name:
logging.warning(
f"{_thread_id} [W] '{msg}' ---> '{module}':{line_number}, '{function_name}()'",
f"{_thread_id}:{__version__} [W] '{msg}' ---> '{module}':{line_number}, '{function_name}()'",
*args,
)
else:
logging.warning(f"{_thread_id} [W] {msg}", *args)
logging.warning(f"{_thread_id}:{__version__} [W] {msg}", *args)
def logging_info(msg: str, *args) -> None:
@@ -94,17 +97,17 @@ def logging_info(msg: str, *args) -> None:
msg (str): The info message to log.
"""
_thread_id = threading.get_ident()
if not verbose:
logging.info(f"{_thread_id} [*] {msg}", *args)
if not __verbose__:
logging.info(f"{_thread_id}:{__version__} [*] {msg}", *args)
return
module, line_number, function_name = get_context_info()
if module and line_number and function_name:
logging.info(
f"{_thread_id} [*] '{msg}' ---> '{module}':{line_number}, '{function_name}()'",
f"{_thread_id}:{__version__} [*] '{msg}' ---> '{module}':{line_number}, '{function_name}()'",
*args,
)
else:
logging.info(f"{_thread_id} [*] {msg}", *args)
logging.info(f"{_thread_id}:{__version__} [*] {msg}", *args)
def logging_debug(msg: str, *args) -> None:
@@ -118,8 +121,8 @@ def logging_debug(msg: str, *args) -> None:
module, line_number, function_name = get_context_info()
if module and line_number and function_name:
logging.info(
f"{_thread_id} [DBG] '{msg}' ---> '{module}':{line_number}, '{function_name}()'",
f"{_thread_id}:{__version__} [DBG] '{msg}' ---> '{module}':{line_number}, '{function_name}()'",
*args,
)
else:
logging.debug(f"{_thread_id} [DBG] {msg}", *args)
logging.debug(f"{_thread_id}:{__version__} [DBG] {msg}", *args)