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
commit c43a3ac1cd
1 changed files with 3 additions and 3 deletions

View File

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