Commit 6dd59f16 authored by Vinay Sajip's avatar Vinay Sajip

Removed buggy exception handling in doRollover of rotating file handlers....

Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller.
parent c315a0fa
......@@ -128,12 +128,7 @@ class RotatingFileHandler(BaseRotatingHandler):
dfn = self.baseFilename + ".1"
if os.path.exists(dfn):
os.remove(dfn)
try:
os.rename(self.baseFilename, dfn)
except (KeyboardInterrupt, SystemExit):
raise
except:
self.handleError(record)
os.rename(self.baseFilename, dfn)
#print "%s -> %s" % (self.baseFilename, dfn)
if self.encoding:
self.stream = codecs.open(self.baseFilename, 'w', self.encoding)
......@@ -273,12 +268,7 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
dfn = self.baseFilename + "." + time.strftime(self.suffix, timeTuple)
if os.path.exists(dfn):
os.remove(dfn)
try:
os.rename(self.baseFilename, dfn)
except (KeyboardInterrupt, SystemExit):
raise
except:
self.handleError(record)
os.rename(self.baseFilename, dfn)
if self.backupCount > 0:
# find the oldest log file and delete it
s = glob.glob(self.baseFilename + ".20*")
......
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