github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch '0.10' into 0.11

pull/2517/head
sebres 2019-07-29 14:25:19 +02:00
parent 1cdd618232 39d9133baa
commit 15734a923b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fail2ban/server/filtersystemd.py
View File

@ -91,7 +91,9 @@ class FilterSystemd(JournalFilter): # pragma: systemd no cover
try:
args['flags'] = int(kwargs.pop('journalflags'))
except KeyError:
args['flags'] = 4
# be sure all journal types will be opened if files specified (don't set flags):
if 'files' not in args or not len(args['files']):
args['flags'] = 4
return args

5
fail2ban/tests/filtertestcase.py
View File

@ -1280,6 +1280,11 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
jrnlfile = self._getRuntimeJournal()
self._initFilter(journalfiles=jrnlfile)
def testJournalFilesAndFlagsArgs(self):
# retrieve current system journal path
jrnlfile = self._getRuntimeJournal()
self._initFilter(journalfiles=jrnlfile, journalflags=0)
def testJournalPathArg(self):
# retrieve current system journal path
jrnlpath = self._getRuntimeJournal()