Extra kwargs of log() are ignored by LoggerAdapter

- extra kwargs given to Logger#log are ignored when we configure
a LoggerAdapter (same for: debug, info, warning etc).
- LoggerAdapter processes only extra kwargs given during its __init__
- I expect extras are merged

Signed-off-by: Cyril Martin <[email protected]>

Author: Cyril Martin

Lib/logging/__init__.py

@@ -1647,7 +1647,7 @@ def __init__(self, logger, extra):
         adapter = LoggerAdapter(someLogger, dict(p1=v1, p2="v2"))
         """
         self.logger = logger
-        self.extra = extra
+        self.extra = extra or {}
 
     def process(self, msg, kwargs):
         """
@@ -1659,7 +1659,7 @@ def process(self, msg, kwargs):
         Normally, you'll only need to override this one method in a
         LoggerAdapter subclass for your specific needs.
         """
-        kwargs["extra"] = self.extra
+        kwargs["extra"] = { **self.extra, **(kwargs.get("extra", {})) }
         return msg, kwargs
 
     #

Misc/NEWS.d/next/Library/2018-01-31-19-56-00.bpo-32732.mcOOli.rst

@@ -0,0 +1 @@
+Do not ignore extra in logging method when a LoggerAdapter is configured. Patch by Cyril Martin