From: Vinay Sajip Date: Thu, 23 Feb 2012 20:51:18 +0000 (+0000) Subject: Merged fix added for recent changes in non-threading environments. X-Git-Tag: v3.3.0a1~81^2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=323e4fb864301654a798e273409b645d097d02a5;p=python Merged fix added for recent changes in non-threading environments. --- 323e4fb864301654a798e273409b645d097d02a5 diff --cc Lib/logging/handlers.py index 0107853cfa,708edc51ac..ee0096a8cb --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@@ -792,9 -755,13 +795,12 @@@ class SysLogHandler(logging.Handler) """ Closes the socket. """ - with self.lock: + self.acquire() + try: - if self.unixsocket: - self.socket.close() + self.socket.close() logging.Handler.close(self) + finally: + self.release() def mapPriority(self, levelName): """