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

Merge pull request #1770 from tjikkun/double_lock 

resolves deadlock (dual lock) by SYSLOG logging type
pull/1778/head
Serg G. Brester 2017-05-08 14:56:39 +02:00 committed by GitHub
parent b13d9d4e22 2a4dafce5b
commit c43a3ac1cd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fail2ban/server/server.py
View File

@ -638,9 +638,9 @@ class Server:
if self.__syslogSocket == syslogsocket: if self.__syslogSocket == syslogsocket:
return True return True
self.__syslogSocket = syslogsocket self.__syslogSocket = syslogsocket
# Conditionally reload, logtarget depends on socket path when SYSLOG # Conditionally reload, logtarget depends on socket path when SYSLOG
return self.__logTarget != "SYSLOG"\ return self.__logTarget != "SYSLOG"\
or self.setLogTarget(self.__logTarget) or self.setLogTarget(self.__logTarget)
def getLogTarget(self): def getLogTarget(self):
with self.__loggingLock: with self.__loggingLock: