mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue 5013: Fixed bug in FileHandler when delay was set - added fix for RotatingFileHandler and changed header comment slightly.

Browse source
This commit is contained in:
Vinay Sajip 2009-01-20 23:20:02 +00:00
parent 6badbe9f76
commit 592f5fcb8d
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/logging/__init__.py
View file

@ -18,9 +18,6 @@
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, and influenced by Apache's log4j system. comp.lang.python, and influenced by Apache's log4j system.
Should work under Python versions >= 1.5.2, except that source line
information is not available unless 'sys._getframe()' is.
Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved. Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved.
To use, simply 'import logging' and log away! To use, simply 'import logging' and log away!

10
Lib/logging/handlers.py
View file

@ -19,12 +19,9 @@ Additional handlers for the logging package for Python. The core package is
based on PEP 282 and comments thereto in comp.lang.python, and influenced by based on PEP 282 and comments thereto in comp.lang.python, and influenced by
Apache's log4j system. Apache's log4j system.
Should work under Python versions >= 1.5.2, except that source line Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved.
information is not available unless 'sys._getframe()' is.
Copyright (C) 2001-2008 Vinay Sajip. All Rights Reserved. To use, simply 'import logging.handlers' and log away!
To use, simply 'import logging' and log away!
""" """
import logging, socket, types, os, string, cPickle, struct, time, re import logging, socket, types, os, string, cPickle, struct, time, re
@ -141,6 +138,8 @@ class RotatingFileHandler(BaseRotatingHandler):
Basically, see if the supplied record would cause the file to exceed Basically, see if the supplied record would cause the file to exceed
the size limit we have. the size limit we have.
""" """
if self.stream is None: # delay was set...
self.stream = self._open()
if self.maxBytes > 0: # are we rolling over? if self.maxBytes > 0: # are we rolling over?
msg = "%s\n" % self.format(record) msg = "%s\n" % self.format(record)
self.stream.seek(0, 2) #due to non-posix-compliant Windows feature self.stream.seek(0, 2) #due to non-posix-compliant Windows feature
@ -305,6 +304,7 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
then we have to get a list of matching filenames, sort them and remove then we have to get a list of matching filenames, sort them and remove
the one with the oldest suffix. the one with the oldest suffix.
""" """
if self.stream:
self.stream.close() self.stream.close()
# get the time that this sequence started at and make it a TimeTuple # get the time that this sequence started at and make it a TimeTuple
t = self.rolloverAt - self.interval t = self.rolloverAt - self.interval