Merge pull request #589 from grooverdan/one-bad-regex-gh-585

fault tolerance when pushing multiple configurations
pull/591/head^2
Steven Hiscocks 11 years ago
commit 0b4dd6272c

@ -36,6 +36,8 @@ ver. 0.8.12 (2014/01/XX) - things-can-only-get-better
a specific jail.
- Filter dovecot reordered session and TLS items in regex with wider scope
for session characters. Thanks Ivo Truxa. Closes gh-586
- A single bad failregex or command syntax in configuration files won't stop
fail2ban from starting. Thanks Tomasz Ciolek. Closes gh-585.
- Enhancements:
- long names on jails documented based on iptables limit of 30 less

@ -82,6 +82,7 @@ Stephen Gildea
Steven Hiscocks
Tom Pike
Tomas Pihl
Tomasz Ciolek
Tyler
Vaclav Misek
Vincent Deffontaines

@ -145,6 +145,7 @@ class Fail2banClient:
def __processCmd(self, cmd, showRet = True):
beautifier = Beautifier()
ret = True
for c in cmd:
beautifier.setInputCmd(c)
try:
@ -155,10 +156,10 @@ class Fail2banClient:
if showRet:
print beautifier.beautify(ret[1])
else:
ret = False
logSys.error("NOK: " + `ret[1].args`)
if showRet:
print beautifier.beautifyError(ret[1])
return False
except socket.error:
if showRet:
logSys.error("Unable to contact server. Is it running?")
@ -167,7 +168,7 @@ class Fail2banClient:
if showRet:
logSys.error(e)
return False
return True
return ret
##
# Process a command line.

Loading…
Cancel
Save