Skip to content

journal: add extra parameter to JournalHandler constructor #52

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

Closed
wants to merge 1 commit into from
Closed

journal: add extra parameter to JournalHandler constructor #52

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
4 changes: 3 additions & 1 deletion systemd/journal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,9 +553,11 @@ class JournalHandler(_logging.Handler):
the `sender_function` parameter.
"""

def __init__(self, level=_logging.NOTSET, sender_function=send, **kwargs):
def __init__(self, level=_logging.NOTSET, extra=None, sender_function=send, **kwargs):
super(JournalHandler, self).__init__(level)

if isinstance(extra, dict):
kwargs.update(extra)
for name in kwargs:
if not _valid_field_name(name):
raise ValueError('Invalid field name: ' + name)
Expand Down
18 changes: 18 additions & 0 deletions systemd/test/test_journal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,13 @@ def test_journalhandler_init_exception():
kw = {' X ':3}
with pytest.raises(ValueError):
journal.JournalHandler(**kw)
with pytest.raises(ValueError):
journal.JournalHandler(logging.INFO, kw)

def test_journalhandler_init():
kw = {'X':3, 'X3':4}
journal.JournalHandler(logging.INFO, **kw)
journal.JournalHandler(logging.INFO, kw)

def test_journalhandler_info():
record = logging.LogRecord('test-logger', logging.INFO, 'testpath', 1, 'test', None, None)
Expand All @@ -98,6 +101,21 @@ def test_journalhandler_info():
assert 'X=3' in sender.buf[0]
assert 'X3=4' in sender.buf[0]

sender = MockSender()
handler = journal.JournalHandler(logging.INFO, {'X':3, 'X3':4}, sender_function=sender.send)
handler.emit(record)
assert len(sender.buf) == 1
assert 'X=3' in sender.buf[0]
assert 'X3=4' in sender.buf[0]

sender = MockSender()
kw = {'X3':4}
handler = journal.JournalHandler(logging.INFO, {'X':3}, sender_function=sender.send, **kw)
handler.emit(record)
assert len(sender.buf) == 1
assert 'X=3' in sender.buf[0]
assert 'X3=4' in sender.buf[0]

def test_journalhandler_no_message_id():
record = logging.LogRecord('test-logger', logging.INFO, 'testpath', 1, 'test', None, None)
sender = MockSender()
Expand Down