Skip to content

Skip interpolation if args is empty #15

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
AttilaGombosER merged 1 commit into from
May 10, 2025
Merged

Skip interpolation if args is empty #15

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ on:

jobs:
call_ci:
uses: EffectiveRange/ci-workflows/.github/workflows/python-ci.yaml@v3
uses: EffectiveRange/ci-workflows/.github/workflows/python-ci.yaml@v5
23 changes: 13 additions & 10 deletions context_logger/filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,19 @@ def __init__(self, application_name: str, message_field: str):
self._message_field = message_field

def filter(self, record: LogRecord) -> bool:
if not isinstance(record.msg, dict):
record.msg = {self._message_field: record.msg % record.args}
record.args = ()

record.msg['hostname'] = socket.gethostname()
record.msg['application'] = self._application_name
record.msg['app_version'] = self._get_application_version()

if 'process_name' in record.msg:
record.msg['process_name'] = record.processName
try:
if isinstance(record.msg, str):
record.msg = {self._message_field: record.msg % record.args if record.args else record.msg}
record.args = ()

record.msg['hostname'] = socket.gethostname()
record.msg['application'] = self._application_name
record.msg['app_version'] = self._get_application_version()

if 'process_name' in record.msg:
record.msg['process_name'] = record.processName
except Exception as exception:
print('Failed to handle log record:', exception)

return True

Expand Down
4 changes: 4 additions & 0 deletions tests/loggerTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def test_file_logging(self):
# When
log.info('This is a simple message')
stdlib_log.info('This is a %s message', 'simple')
stdlib_log.info('This is a %s message', )
log.error('This is an error message', error_message='Something terrible happened', error_code=1234)
stdlib_log.error('This is an error message')

Expand All @@ -74,6 +75,9 @@ def test_file_logging(self):
log_entry = json.loads(log_file.readline())
assert_simple_message(self, log_entry)

log_entry = json.loads(log_file.readline())
self.assertEqual('This is a %s message', log_entry.get('message'))

log_entry = json.loads(log_file.readline())
self.assertEqual('This is an error message', log_entry.get('message'))
self.assertEqual('Something terrible happened', log_entry.get('error_message'))
Expand Down
Loading