Burtiraven2/session_redis_public
1
0
Fork 0
mirror of https://github.com/camptocamp/odoo-cloud-platform.git synced 2026-06-23 18:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #487 from camptocamp/18.0-jsonlogger-import

Browse Source 
fix: adapt import of jsonlogger
This commit is contained in:
Florent Xicluna
2025-05-06 10:50:59 +02:00
committed by GitHub
co-authored by GitHub
parent b929f7bbc5 0f4756e420
commit 9965a55414
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logging_json/json_log.py
+3 -3
View File
@@ -13,9 +13,9 @@ from .strtobool import strtobool
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
try: try:
from pythonjsonlogger import jsonlogger from pythonjsonlogger.json import JsonFormatter
except ImportError: except ImportError:
jsonlogger = None # noqa JsonFormatter = None # noqa
_logger.debug("Cannot 'import pythonjsonlogger'.") _logger.debug("Cannot 'import pythonjsonlogger'.")
@@ -23,7 +23,7 @@ def is_true(strval):
return bool(strtobool(strval or "0".lower())) return bool(strtobool(strval or "0".lower()))
class OdooJsonFormatter(jsonlogger.JsonFormatter): class OdooJsonFormatter(JsonFormatter):
def add_fields(self, log_record, record, message_dict): def add_fields(self, log_record, record, message_dict):
record.pid = os.getpid() record.pid = os.getpid()
record.dbname = getattr(threading.current_thread(), "dbname", "?") record.dbname = getattr(threading.current_thread(), "dbname", "?")