Skip to content

[17.0][FIX] logging_json: forward compatibility #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SilvioC2C wants to merge 1 commit into
base: 17.0
Choose a base branch
from
Open

[17.0][FIX] logging_json: forward compatibility #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions logging_json/json_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,23 @@
import threading
import uuid

import pythonjsonlogger

from odoo import http

from .strtobool import strtobool

_logger = logging.getLogger(__name__)

try:
from pythonjsonlogger import jsonlogger
except ImportError:
# Module ``jsonlogger`` of package ``python-json-logger`` is deprecated since version
# 3.1.0, keep it for backward compatibility
if hasattr(pythonjsonlogger, "json"):
jsonlogger = pythonjsonlogger.json
elif hasattr(pythonjsonlogger, "jsonlogger"):
jsonlogger = pythonjsonlogger.jsonlogger
else:
jsonlogger = None # noqa
_logger.debug("Cannot 'import pythonjsonlogger'.")
_logger.debug("Cannot import 'json' or 'jsonlogger' from 'pythonjsonlogger'.")


def is_true(strval):
Expand Down