Commit b0c7fede authored by Vinay Sajip's avatar Vinay Sajip

Exceptions raised during renaming in rotating file handlers are now passed to...

Exceptions raised during renaming in rotating file handlers are now passed to handleError (except for SystemExit and KeyboardInterrupt, which are re-raised).
parent 4badbf4a
......@@ -126,7 +126,12 @@ class RotatingFileHandler(BaseRotatingHandler):
dfn = self.baseFilename + ".1"
if os.path.exists(dfn):
os.remove(dfn)
os.rename(self.baseFilename, dfn)
try:
os.rename(self.baseFilename, dfn)
except (KeyboardInterrupt, SystemExit):
raise
except:
pass
#print "%s -> %s" % (self.baseFilename, dfn)
if self.encoding:
self.stream = codecs.open(self.baseFilename, 'w', self.encoding)
......@@ -270,7 +275,12 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
dfn = self.baseFilename + "." + time.strftime(self.suffix, timeTuple)
if os.path.exists(dfn):
os.remove(dfn)
os.rename(self.baseFilename, dfn)
try:
os.rename(self.baseFilename, dfn)
except (KeyboardInterrupt, SystemExit):
raise
except:
pass
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