Burtiraven2/session_redis_public
1
0
Fork 0
mirror of https://github.com/camptocamp/odoo-cloud-platform.git synced 2026-06-24 08:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] logging_json: forward compatibility (#510)

Browse Source 
Make the module compatible w/ ``python-json-logger==3.3.*`` (importing ``jsonlogger`` displays a deprecation warning)

Co-authored-by: SilvioC2C <87646954+SilvioC2C@users.noreply.github.com>
This commit is contained in:
Stéphane Bidoul
2026-02-13 13:33:41 +01:00
committed by GitHub
co-authored by GitHub SilvioC2C
parent 627975b282
commit 083417f583
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logging_json/json_log.py
+10 -4
View File
@@ -6,17 +6,23 @@ import os
import threading import threading
import uuid import uuid
import pythonjsonlogger
from odoo import http from odoo import http
from .strtobool import strtobool from .strtobool import strtobool
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
try: # Module ``jsonlogger`` of package ``python-json-logger`` is deprecated since version
from pythonjsonlogger import jsonlogger # 3.1.0, keep it for backward compatibility
except ImportError: if hasattr(pythonjsonlogger, "json"):
jsonlogger = pythonjsonlogger.json
elif hasattr(pythonjsonlogger, "jsonlogger"):
jsonlogger = pythonjsonlogger.jsonlogger
else:
jsonlogger = None # noqa jsonlogger = None # noqa
_logger.debug("Cannot 'import pythonjsonlogger'.") _logger.debug("Cannot import 'json' or 'jsonlogger' from 'pythonjsonlogger'.")
def is_true(strval): def is_true(strval):