mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Closes #24884: refactored WatchedFileHandler file reopening into a separate method, based on a suggestion and patch by Marian Horban.

Browse source
This commit is contained in:
Vinay Sajip 2015-10-01 20:54:41 +01:00
parent 14b1b486ca
commit 29a1445136
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/logging/handlers.py
View file

@ -440,11 +440,11 @@ class WatchedFileHandler(logging.FileHandler):
sres = os.fstat(self.stream.fileno())
self.dev, self.ino = sres[ST_DEV], sres[ST_INO]
def emit(self, record):
def reopenIfNeeded(self):
"""
Emit a record.
Reopen log file if needed.
First check if the underlying file has changed, and if it
Checks if the underlying file has changed, and if it
has, close the old stream and reopen the file to get the
current stream.
"""
@ -467,6 +467,15 @@ class WatchedFileHandler(logging.FileHandler):
# open a new file handle and get new stat info from that fd
self.stream = self._open()
self._statstream()
def emit(self, record):
"""
Emit a record.
If underlying file has changed, reopen the file before emitting the
record to it.
"""
self.reopenIfNeeded()
logging.FileHandler.emit(self, record)