mirror of https://github.com/fail2ban/fail2ban
Reintegrate 'master' into 0.10 (merge point) + small code review
commit
2b08847f3a
|
@ -302,6 +302,8 @@ releases.
|
|||
|
||||
|
||||
### 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
|
||||
|
||||
|
|
|
@ -315,6 +315,7 @@ class FilterSystemd(JournalFilter): # pragma: systemd no cover
|
|||
self.commonError()
|
||||
|
||||
logSys.debug("[%s] filter terminated", self.jailName)
|
||||
|
||||
# close journal:
|
||||
try:
|
||||
if self.__journal:
|
||||
|
@ -322,8 +323,8 @@ class FilterSystemd(JournalFilter): # pragma: systemd no cover
|
|||
except Exception as e: # pragma: no cover
|
||||
logSys.error("Close journal failed: %r", e,
|
||||
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
|
||||
|
||||
def status(self, flavor="basic"):
|
||||
|
|
Loading…
Reference in New Issue