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

closes gh-2758: no explicit flush (close std-channels on exit, it would cause implicit flush without to produce an error 32 "Broken pipe" on closed pipe)

pull/2814/head
sebres 2020-08-11 13:57:36 +02:00
parent a7ad3e00dd
commit 39d4bb3c35
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fail2ban/client/fail2bancmdline.py
View File

@ -308,6 +308,10 @@ class Fail2banCmdLine():
# since method is also exposed in API via globally bound variable # since method is also exposed in API via globally bound variable
@staticmethod @staticmethod
def _exit(code=0): def _exit(code=0):
# implicit flush without to produce broken pipe error (32):
sys.stderr.close()
sys.stdout.close()
# exit:
if hasattr(os, '_exit') and os._exit: if hasattr(os, '_exit') and os._exit:
os._exit(code) os._exit(code)
else: else:
@ -318,8 +322,6 @@ class Fail2banCmdLine():
logSys.debug("Exit with code %s", code) logSys.debug("Exit with code %s", code)
# because of possible buffered output in python, we should flush it before exit: # because of possible buffered output in python, we should flush it before exit:
logging.shutdown() logging.shutdown()
sys.stdout.flush()
sys.stderr.flush()
# exit # exit
Fail2banCmdLine._exit(code) Fail2banCmdLine._exit(code)