mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-109461: Update logging module lock to use context manager (#109462)

Browse source 
Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
Dale Collison 2023-09-27 17:26:41 +01:00 • committed by GitHub
parent cc54bcf17b
commit 74723e1110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 81 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/logging/handlers.py
View file

@ -683,15 +683,12 @@ class SocketHandler(logging.Handler):
"""
Closes the socket.
"""
self.acquire()
try:
with self.lock:
sock = self.sock
if sock:
self.sock = None
sock.close()
logging.Handler.close(self)
finally:
self.release()
class DatagramHandler(SocketHandler):
"""
@ -953,15 +950,12 @@ class SysLogHandler(logging.Handler):
"""
Closes the socket.
"""
self.acquire()
try:
with self.lock:
sock = self.socket
if sock:
self.socket = None
sock.close()
logging.Handler.close(self)
finally:
self.release()
def mapPriority(self, levelName):
"""
@ -1333,11 +1327,8 @@ class BufferingHandler(logging.Handler):
This version just zaps the buffer to empty.
"""
self.acquire()
try:
with self.lock:
self.buffer.clear()
finally:
self.release()
def close(self):
"""
@ -1387,11 +1378,8 @@ class MemoryHandler(BufferingHandler):
"""
Set the target handler for this handler.
"""
self.acquire()
try:
with self.lock:
self.target = target
finally:
self.release()
def flush(self):
"""
@ -1401,14 +1389,11 @@ class MemoryHandler(BufferingHandler):
The record buffer is only cleared if a target has been set.
"""
self.acquire()
try:
with self.lock:
if self.target:
for record in self.buffer:
self.target.handle(record)
self.buffer.clear()
finally:
self.release()
def close(self):
"""
@ -1419,12 +1404,9 @@ class MemoryHandler(BufferingHandler):
if self.flushOnClose:
self.flush()
finally:
self.acquire()
try:
with self.lock:
self.target = None
BufferingHandler.close(self)
finally:
self.release()
class QueueHandler(logging.Handler):