def add_match(self, *args, **kwargs):
args = list(args)
args.extend(_make_line(key, val) for key, val in kwargs.items())
- super(Journal, self).add_match(*args)
+ for arg in args:
+ super(Journal, self).add_match(arg)
def get_next(self, skip=1):
return self._convert_entry(
def seek_realtime(self, timestamp):
if isinstance(timestamp, datetime.datetime):
- timestamp = int(timestamp.strftime("%s%f"))
+ timestamp = float(timestamp.strftime("%s.%f"))
return super(Journal, self).seek_realtime(timestamp)
def seek_monotonic(self, timestamp, bootid=None):
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):