X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fpython-systemd%2Fjournal.py;h=ab8661e987343f636f3fcd5351b72fe86120cd74;hp=db35ba20056b3f0986b3b2e82806562d91118f10;hb=518dc5dff557116db3f072eb9d0a9492b6226778;hpb=71766afa2d80ffe1b03c410f6d5ffdc140883314 diff --git a/src/python-systemd/journal.py b/src/python-systemd/journal.py index db35ba200..ab8661e98 100644 --- a/src/python-systemd/journal.py +++ b/src/python-systemd/journal.py @@ -113,7 +113,8 @@ class Journal(_Journal): 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( @@ -123,6 +124,16 @@ class Journal(_Journal): return set(self._convert_field(key, value) for value in super(Journal, self).query_unique(key)) + def seek_realtime(self, timestamp): + if isinstance(timestamp, datetime.datetime): + timestamp = float(timestamp.strftime("%s.%f")) + return super(Journal, self).seek_realtime(timestamp) + + def seek_monotonic(self, timestamp, bootid=None): + if isinstance(timestamp, datetime.timedelta): + timestamp = timestamp.totalseconds() + return super(Journal, self).seek_monotonic(timestamp, bootid) + def log_level(self, level): """Sets maximum log level by setting matches for PRIORITY.""" if 0 <= level <= 7: