dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-17 04:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd-python: Journal this_boot/machine now accepts ID

Browse Source
This commit is contained in:
Steven Hiscocks
2013-02-17 11:48:13 +00:00
committed by Zbigniew Jędrzejewski-Szmek
parent dd37d563ba
commit 301ae164b7
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/python-systemd/journal.py
View File

@@ -142,13 +142,28 @@ class Journal(_Journal):
else:
raise ValueError("Log level must be 0 <= level <= 7")
def this_boot(self):
"""Add match for _BOOT_ID equal to current boot ID."""
self.add_match(_BOOT_ID=_id128.get_boot().hex)
def this_boot(self, bootid=None):
"""Add match for _BOOT_ID equal to current boot ID or the specified boot ID.
bootid should be either a UUID or a 32 digit hex number.
"""
if bootid is None:
bootid = _id128.get_boot().hex
else:
bootid = getattr(bootid, 'hex', bootid)
self.add_match(_BOOT_ID=bootid)
def this_machine(self, machineid=None):
"""Add match for _MACHINE_ID equal to the ID of this machine.
bootid should be either a UUID or a 32 digit hex number.
"""
if machineid is None:
machineid = _id128.get_machine().hex
else:
machineid = getattr(machineid, 'hex', machineid)
self.add_match(_MACHINE_ID=machineid)
def this_machine(self):
"""Add match for _MACHINE_ID equal to the ID of this machine."""
self.add_match(_MACHINE_ID=_id128.get_machine().hex)
def _make_line(field, value):
if isinstance(value, bytes):