Merge branch '0.10' into 0.11

pull/3299/head
sebres 3 years ago
commit a69d42cea5

@ -10,7 +10,7 @@ after = common.local
[DEFAULT]
# Type of log-file resp. log-format (file, short, journal, rfc542):
# Type of log-file resp. log-format (file, short, journal, rfc5424):
logtype = file
# Daemon definition is to be specialized (if needed) in .conf file

@ -250,7 +250,7 @@ class FilterSystemd(JournalFilter): # pragma: systemd no cover
logSys.log(5, "[%s] Read systemd journal entry: %s %s", self.jailName,
date[0], logline)
## use the same type for 1st argument:
return ((logline[:0], date[0], logline.replace('\n', '\\n')), date[1])
return ((logline[:0], date[0] + ' ', logline.replace('\n', '\\n')), date[1])
def seekToTime(self, date):
if isinstance(date, (int, long)):

Loading…
Cancel
Save