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

fixes gh-3635: avoid sporadic error in pyinotify backend if pending file deleted in other thread; restore correct logging in tests

pull/3402/merge
sebres 2023-11-22 20:16:53 +01:00
parent 22ce0c0536 5d9817728d
commit 44fa2959e7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fail2ban/server/filterpyinotify.py
View File

@ -173,7 +173,9 @@ class FilterPyinotify(FileFilter):
if not chkpath(path): # not found - prolong for next time if not chkpath(path): # not found - prolong for next time
if retardTM < 60: retardTM *= 2 if retardTM < 60: retardTM *= 2
if minTime > retardTM: minTime = retardTM if minTime > retardTM: minTime = retardTM
try:
self.__pending[path][0] = retardTM self.__pending[path][0] = retardTM
except KeyError: pass
continue continue
logSys.log(logging.MSG, "Log presence detected for %s %s", logSys.log(logging.MSG, "Log presence detected for %s %s",
"directory" if isDir else "file", path) "directory" if isDir else "file", path)

1
fail2ban/tests/clientreadertestcase.py
View File

@ -61,6 +61,7 @@ class ConfigReaderTest(unittest.TestCase):
def tearDown(self): def tearDown(self):
"""Call after every test case.""" """Call after every test case."""
shutil.rmtree(self.d) shutil.rmtree(self.d)
super(ConfigReaderTest, self).tearDown()
def _write(self, fname, value=None, content=None): def _write(self, fname, value=None, content=None):
# verify if we don't need to create .d directory # verify if we don't need to create .d directory

3
fail2ban/tests/sockettestcase.py
View File

@ -54,7 +54,6 @@ class Socket(LogCaptureTestCase):
def setUp(self): def setUp(self):
"""Call before every test case.""" """Call before every test case."""
LogCaptureTestCase.setUp(self)
super(Socket, self).setUp() super(Socket, self).setUp()
self.server = AsyncServer(self) self.server = AsyncServer(self)
sock_fd, sock_name = tempfile.mkstemp('fail2ban.sock', 'f2b-socket') sock_fd, sock_name = tempfile.mkstemp('fail2ban.sock', 'f2b-socket')
@ -68,7 +67,7 @@ class Socket(LogCaptureTestCase):
if self.serverThread: if self.serverThread:
self.server.stop(); # stop if not already stopped self.server.stop(); # stop if not already stopped
self._stopServerThread() self._stopServerThread()
LogCaptureTestCase.tearDown(self) super(Socket, self).tearDown()
@staticmethod @staticmethod
def proceed(message): def proceed(message):