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

Merge pull request #985 from yarikoptic/bf/bad_file_descr_3.4 

BF: asyncore.loop poll=True for recent (>=3.4) pythons too
pull/996/head
Yaroslav Halchenko 2015-03-21 13:31:10 -04:00
parent daa2a9e5d8 31d107d181
commit 782629c256
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -32,8 +32,8 @@ ver. 0.9.2 (2014/XX/XXX) - wanna-be-released
* filter.d/dovecot.conf * filter.d/dovecot.conf
- match pam_authenticate line from EL7 - match pam_authenticate line from EL7
- match unknown user line from EL7 - match unknown user line from EL7
* Use use_poll=True for Python 2.7 to overcome "Bad file descriptor" msgs * Use use_poll=True for Python 2.7 and >=3.4 to overcome "Bad file
issue (gh-161) descriptor" msgs issue (gh-161)
* filter.d/postfix-sasl.conf - tweak failregex and add ignoreregex to ignore * filter.d/postfix-sasl.conf - tweak failregex and add ignoreregex to ignore
system authentication issues system authentication issues
* fail2ban-regex reads filter file(s) completely, incl. '.local' file etc. (gh-954) * fail2ban-regex reads filter file(s) completely, incl. '.local' file etc. (gh-954)

3
fail2ban/server/asyncserver.py
View File

@ -149,7 +149,8 @@ class AsyncServer(asyncore.dispatcher):
self.__init = True self.__init = True
# TODO Add try..catch # TODO Add try..catch
# There's a bug report for Python 2.6/3.0 that use_poll=True yields some 2.5 incompatibilities: # There's a bug report for Python 2.6/3.0 that use_poll=True yields some 2.5 incompatibilities:
if sys.version_info >= (2, 7) and sys.version_info < (2, 8): # if python 2.7 ... if (sys.version_info >= (2, 7) and sys.version_info < (2, 8)) \
or (sys.version_info >= (3, 4)): # if python 2.7 ...
logSys.debug("Detected Python 2.7. asyncore.loop() using poll") logSys.debug("Detected Python 2.7. asyncore.loop() using poll")
asyncore.loop(use_poll=True) # workaround for the "Bad file descriptor" issue on Python 2.7, gh-161 asyncore.loop(use_poll=True) # workaround for the "Bad file descriptor" issue on Python 2.7, gh-161
else: else: