Commit a01fe031 authored by Vinay Sajip's avatar Vinay Sajip

Replaced my dumb way of calculating seconds to midnight with Tim Peters' much...

Replaced my dumb way of calculating seconds to midnight with Tim Peters' much more sensible suggestion. What was I thinking ?!?
parent a3d0e68f
......@@ -44,6 +44,8 @@ DEFAULT_HTTP_LOGGING_PORT = 9022
DEFAULT_SOAP_LOGGING_PORT = 9023
SYSLOG_UDP_PORT = 514
_MIDNIGHT = 24 * 60 * 60 # number of seconds in a day
class BaseRotatingHandler(logging.FileHandler):
"""
Base class for handlers that rotate log files at a certain point.
......@@ -217,12 +219,8 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
currentMinute = t[4]
currentSecond = t[5]
# r is the number of seconds left between now and midnight
if (currentMinute == 0) and (currentSecond == 0):
r = (24 - currentHour) * 60 * 60 # number of hours in seconds
else:
r = (23 - currentHour) * 60 * 60
r = r + (59 - currentMinute) * 60 # plus the number of minutes (in secs)
r = r + (60 - currentSecond) # plus the number of seconds
r = _MIDNIGHT - ((currentHour * 60 + currentMinute) * 60 +
currentSecond)
self.rolloverAt = currentTime + r
# If we are rolling over on a certain day, add in the number of days until
# the next rollover, but offset by 1 since we just calculated the time
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment