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

Merge pull request #918 from sebres/issue/161 

Issue/161
pull/944/head
Yaroslav Halchenko 2015-02-02 21:44:57 -05:00
parent 73af02ffc6 607af36ad3
commit 1fbafa46c9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fail2ban/server/asyncserver.py
View File

@ -149,8 +149,11 @@ 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:
logSys.debug("Detected Python 2.6 or greater. asyncore.loop() not using poll") if sys.version_info >= (2, 7) and sys.version_info < (2, 8): # if python 2.7 ...
asyncore.loop(use_poll=False) # fixes the "Unexpected communication problem" issue on Python 2.6 and 3.0 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
else:
asyncore.loop(use_poll=False) # fixes the "Unexpected communication problem" issue on Python 2.6 and 3.0
## ##
# Stops the communication server. # Stops the communication server.

2
fail2ban/tests/misctestcase.py
View File

@ -113,7 +113,7 @@ class SetupTest(unittest.TestCase):
# clean up # clean up
shutil.rmtree(tmp) shutil.rmtree(tmp)
# remove build directory # remove build directory
os.system("%s %s clean --all >/dev/null" os.system("%s %s clean --all >/dev/null 2>&1"
% (sys.executable, self.setup)) % (sys.executable, self.setup))
class TestsUtilsTest(unittest.TestCase): class TestsUtilsTest(unittest.TestCase):