commit bababa3eccbff2d7c2c8bf3fc5730cf90825d300
author Vinay Sajip <vinay_sajip@yahoo.co.uk> Wed Oct 24 10:47:06 2007 +0000
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> Wed Oct 24 10:47:06 2007 +0000
tree 4a8b713634ab0a60d55f1cd54297b3dd86f4c24a
parent 3a8daf5b56fc6c298c30536583a5b903f9a31fb3

Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__()

Lib/logging/handlers.py

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 9807f13..fa203cf 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -230,11 +230,11 @@
             #         of days in the next week until the rollover day (3).
             if when.startswith('W'):
                 day = t[6] # 0 is Monday
-                if day > self.dayOfWeek:
-                    daysToWait = (day - self.dayOfWeek) - 1
-                    self.rolloverAt = self.rolloverAt + (daysToWait * (60 * 60 * 24))
-                if day < self.dayOfWeek:
-                    daysToWait = (6 - self.dayOfWeek) + day
+                if day != self.dayOfWeek:
+                    if day < self.dayOfWeek:
+                        daysToWait = self.dayOfWeek - day - 1
+                    else:
+                        daysToWait = 6 - day + self.dayOfWeek
                     self.rolloverAt = self.rolloverAt + (daysToWait * (60 * 60 * 24))
 
         #print "Will rollover at %d, %d seconds from now" % (self.rolloverAt, self.rolloverAt - currentTime)