mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 22:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #18941: Respected delay when doing rollover.

Browse source
This commit is contained in:
Vinay Sajip 2013-09-06 10:25:31 +01:00
parent d859926b29
commit 43c6ef1899
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/logging/__init__.py
View file

@ -1,4 +1,4 @@
# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved. # Copyright 2001-2013 by Vinay Sajip. All Rights Reserved.
# #
# Permission to use, copy, modify, and distribute this software and its # Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose and without fee is hereby granted, # documentation for any purpose and without fee is hereby granted,
@ -18,7 +18,7 @@
Logging package for Python. Based on PEP 282 and comments thereto in Logging package for Python. Based on PEP 282 and comments thereto in
comp.lang.python. comp.lang.python.
Copyright (C) 2001-2012 Vinay Sajip. All Rights Reserved. Copyright (C) 2001-2013 Vinay Sajip. All Rights Reserved.
To use, simply 'import logging' and log away! To use, simply 'import logging' and log away!
""" """
@ -957,6 +957,7 @@ class FileHandler(StreamHandler):
self.baseFilename = os.path.abspath(filename) self.baseFilename = os.path.abspath(filename)
self.mode = mode self.mode = mode
self.encoding = encoding self.encoding = encoding
self.delay = delay
if delay: if delay:
#We don't open the stream, but we still need to call the #We don't open the stream, but we still need to call the
#Handler constructor to set level, formatter, lock etc. #Handler constructor to set level, formatter, lock etc.

6
Lib/logging/handlers.py
View file

@ -174,7 +174,8 @@ class RotatingFileHandler(BaseRotatingHandler):
if os.path.exists(dfn): if os.path.exists(dfn):
os.remove(dfn) os.remove(dfn)
self.rotate(self.baseFilename, dfn) self.rotate(self.baseFilename, dfn)
self.stream = self._open() if not self.delay:
self.stream = self._open()
def shouldRollover(self, record): def shouldRollover(self, record):
""" """
@ -382,7 +383,8 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
if self.backupCount > 0: if self.backupCount > 0:
for s in self.getFilesToDelete(): for s in self.getFilesToDelete():
os.remove(s) os.remove(s)
self.stream = self._open() if not self.delay:
self.stream = self._open()
newRolloverAt = self.computeRollover(currentTime) newRolloverAt = self.computeRollover(currentTime)
while newRolloverAt <= currentTime: while newRolloverAt <= currentTime:
newRolloverAt = newRolloverAt + self.interval newRolloverAt = newRolloverAt + self.interval