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

fix sporadic bugs by starting of fast actions (execute fast sub processes), cherry picked from "f2b-perfom-prepare-716-cs": 

- missing `popen` variable if not started;
- better readability for stdout and stderr in log (+ check log level before do logging);
pull/1346/head
sebres 2016-03-10 12:05:59 +01:00
parent 01b379ab2e
commit 74b88e1706
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fail2ban/server/utils.py
View File

@ -133,6 +133,7 @@ class Utils():
timeout_expr = lambda: time.time() - stime <= timeout timeout_expr = lambda: time.time() - stime <= timeout
else: else:
timeout_expr = timeout timeout_expr = timeout
popen = None
try: try:
popen = subprocess.Popen( popen = subprocess.Popen(
realCmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, realCmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell,
@ -159,7 +160,10 @@ class Utils():
if retcode is None and not Utils.pid_exists(pgid): if retcode is None and not Utils.pid_exists(pgid):
retcode = signal.SIGKILL retcode = signal.SIGKILL
except OSError as e: except OSError as e:
logSys.error("%s -- failed with %s" % (realCmd, e)) stderr = "%s -- failed with %s" % (realCmd, e)
logSys.error(stderr)
if not popen:
return False if not output else (False, stdout, stderr, retcode)
std_level = retcode == 0 and logging.DEBUG or logging.ERROR std_level = retcode == 0 and logging.DEBUG or logging.ERROR
# if we need output (to return or to log it): # if we need output (to return or to log it):
@ -172,8 +176,10 @@ class Utils():
stdout = popen.stdout.read() stdout = popen.stdout.read()
except IOError as e: except IOError as e:
logSys.error(" ... -- failed to read stdout %s", e) logSys.error(" ... -- failed to read stdout %s", e)
if stdout is not None and stdout != '': if stdout is not None and stdout != '' and std_level >= logSys.getEffectiveLevel():
logSys.log(std_level, "%s -- stdout: %r", realCmd, stdout) logSys.log(std_level, "%s -- stdout:", realCmd)
for l in stdout.splitlines():
logSys.log(std_level, " -- stdout: %r", l)
popen.stdout.close() popen.stdout.close()
if popen.stderr: if popen.stderr:
try: try:
@ -182,8 +188,10 @@ class Utils():
stderr = popen.stderr.read() stderr = popen.stderr.read()
except IOError as e: except IOError as e:
logSys.error(" ... -- failed to read stderr %s", e) logSys.error(" ... -- failed to read stderr %s", e)
if stderr is not None and stderr != '': if stderr is not None and stderr != '' and std_level >= logSys.getEffectiveLevel():
logSys.log(std_level, "%s -- stderr: %r", realCmd, stderr) logSys.log(std_level, "%s -- stderr:", realCmd)
for l in stderr.splitlines():
logSys.log(std_level, " -- stderr: %r", l)
popen.stderr.close() popen.stderr.close()
success = False success = False

4
fail2ban/tests/actiontestcase.py
View File

@ -271,11 +271,11 @@ class CommandActionTest(LogCaptureTestCase):
def testCaptureStdOutErr(self): def testCaptureStdOutErr(self):
CommandAction.executeCmd('echo "How now brown cow"') CommandAction.executeCmd('echo "How now brown cow"')
self.assertLogged("'How now brown cow\\n'") self.assertLogged("stdout: 'How now brown cow'\n", "stdout: b'How now brown cow'\n")
CommandAction.executeCmd( CommandAction.executeCmd(
'echo "The rain in Spain stays mainly in the plain" 1>&2') 'echo "The rain in Spain stays mainly in the plain" 1>&2')
self.assertLogged( self.assertLogged(
"'The rain in Spain stays mainly in the plain\\n'") "stderr: 'The rain in Spain stays mainly in the plain'\n", "stderr: b'The rain in Spain stays mainly in the plain'\n")
def testCallingMap(self): def testCallingMap(self):
mymap = CallingMap(callme=lambda: str(10), error=lambda: int('a'), mymap = CallingMap(callme=lambda: str(10), error=lambda: int('a'),