Skip to content

gh-76913: Add "merge extras" feature to LoggerAdapter #107292

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

Merged
vsajip merged 6 commits into from
Aug 15, 2023
Merged

gh-76913: Add "merge extras" feature to LoggerAdapter #107292

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ece898
gh-76913: Add "merge extras" feature to LoggerAdapter
romuald Jul 26, 2023
b61f0ef
gh-76913: Code review fixes
romuald Jul 31, 2023
65dcfcf
gh-76913: Code review fixes (singular form)
romuald Jul 31, 2023
c46ea45
gh-76913: Fix / follow instance attribute name change
romuald Aug 14, 2023
a058d23
gh-76913: Add LoggerAdapter.merge_extra documentation
romuald Aug 14, 2023
0cf1beb
gh-76913: Add Misc/NEWS.d entry
romuald Aug 14, 2023
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
Prev Previous commit
Next Next commit
gh-76913: Fix / follow instance attribute name change
  • Loading branch information
@romuald
romuald committed Aug 14, 2023
commit c46ea457e168975d87139a112a907f59509bb898
2 changes: 1 addition & 1 deletion Lib/logging/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1915,7 +1915,7 @@ def process(self, msg, kwargs):
Normally, you'll only need to override this one method in a
LoggerAdapter subclass for your specific needs.
"""
if self.merge_extras and "extra" in kwargs:
if self.merge_extra and "extra" in kwargs:
kwargs["extra"] = {**self.extra, **kwargs["extra"]}
else:
kwargs["extra"] = self.extra
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5452,7 +5452,7 @@ def test_extra_not_merged_by_default(self):
def test_extra_merged(self):
self.adapter = logging.LoggerAdapter(logger=self.logger,
extra={'foo': '1'},
merge_extras=True)
merge_extra=True)

self.adapter.critical('foo and bar should be here', extra={'bar': '2'})
self.assertEqual(len(self.recording.records), 1)
Expand All @@ -5465,7 +5465,7 @@ def test_extra_merged(self):
def test_extra_merged_log_call_has_precedence(self):
self.adapter = logging.LoggerAdapter(logger=self.logger,
extra={'foo': '1'},
merge_extras=True)
merge_extra=True)

self.adapter.critical('foo shall be min', extra={'foo': '2'})
self.assertEqual(len(self.recording.records), 1)
Expand Down