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

fix: adapt import of jsonlogger

logging_json/json_log.py

@@ -13,9 +13,9 @@ from .strtobool import strtobool
 _logger = logging.getLogger(__name__)
 
 try:
-    from pythonjsonlogger import jsonlogger
+    from pythonjsonlogger.json import JsonFormatter
 except ImportError:
-    jsonlogger = None  # noqa
+    JsonFormatter = None  # noqa
     _logger.debug("Cannot 'import pythonjsonlogger'.")
 
 
@@ -23,7 +23,7 @@ def is_true(strval):
     return bool(strtobool(strval or "0".lower()))
 
 
-class OdooJsonFormatter(jsonlogger.JsonFormatter):
+class OdooJsonFormatter(JsonFormatter):
     def add_fields(self, log_record, record, message_dict):
         record.pid = os.getpid()
         record.dbname = getattr(threading.current_thread(), "dbname", "?")