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

Reintegrate 'master' into 0.10 (merge point) + small code review

pull/1787/head
sebres 2017-05-19 16:32:13 +02:00
parent ae0f0d2ec0 c7ddf1f940
commit 2b08847f3a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -302,6 +302,8 @@ releases.
### Fixes ### Fixes
* Fix for systemd-backend: fail2ban hits the ulimit (out of file descriptors), see gh-991.
Partially back-ported from v.0.10.
### New Features ### New Features

5
fail2ban/server/filtersystemd.py
View File

@ -315,6 +315,7 @@ class FilterSystemd(JournalFilter): # pragma: systemd no cover
self.commonError() self.commonError()
logSys.debug("[%s] filter terminated", self.jailName) logSys.debug("[%s] filter terminated", self.jailName)
# close journal: # close journal:
try: try:
if self.__journal: if self.__journal:
@ -322,8 +323,8 @@ class FilterSystemd(JournalFilter): # pragma: systemd no cover
except Exception as e: # pragma: no cover except Exception as e: # pragma: no cover
logSys.error("Close journal failed: %r", e, logSys.error("Close journal failed: %r", e,
exc_info=logSys.getEffectiveLevel()<=logging.DEBUG) exc_info=logSys.getEffectiveLevel()<=logging.DEBUG)
logSys.debug((self.jail is not None and self.jail.name
or "jailless") +" filter terminated") logSys.debug("[%s] filter exited (systemd)", self.jailName)
return True return True
def status(self, flavor="basic"): def status(self, flavor="basic"):