From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 16 Jan 2006 09:08:06 +0000 (+0000)
Subject: Fixed bug in time-to-midnight calculation.
X-Git-Tag: v2.5a0~813
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74a83e9ffbee00288bbc1ddd0e5a40e84a03b4af;p=thirdparty%2FPython%2Fcpython.git

Fixed bug in time-to-midnight calculation.
---

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 1ec9afcdc3d0..6225f17f9678 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -212,9 +212,12 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
             currentMinute = t[4]
             currentSecond = t[5]
             # r is the number of seconds left between now and midnight
-            r = (24 - currentHour) * 60 * 60 # number of hours in seconds
-            r = r + (59 - currentMinute) * 60 # plus the number of minutes (in secs)
-            r = r + (59 - currentSecond) # plus the number of seconds
+            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
             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