From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 6 Sep 2013 09:09:45 +0000 (+0100)
Subject: Issue #18940: Handled low-volume logging when delay is True.
X-Git-Tag: v2.7.6rc1~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d7e29651cf6a2232d66e47974c522cc2927a6c2;p=thirdparty%2FPython%2Fcpython.git

Issue #18940: Handled low-volume logging when delay is True.
---

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index c4b8746ee5a9..8a813d3e375e 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -137,7 +137,9 @@ class RotatingFileHandler(BaseRotatingHandler):
             dfn = self.baseFilename + ".1"
             if os.path.exists(dfn):
                 os.remove(dfn)
-            os.rename(self.baseFilename, dfn)
+            # Issue 18940: A file may not have been created if delay is True.
+            if os.path.exists(self.baseFilename):
+                os.rename(self.baseFilename, dfn)
             #print "%s -> %s" % (self.baseFilename, dfn)
         self.stream = self._open()
 
@@ -343,7 +345,9 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
         dfn = self.baseFilename + "." + time.strftime(self.suffix, timeTuple)
         if os.path.exists(dfn):
             os.remove(dfn)
-        os.rename(self.baseFilename, dfn)
+        # Issue 18940: A file may not have been created if delay is True.
+        if os.path.exists(self.baseFilename):
+            os.rename(self.baseFilename, dfn)
         if self.backupCount > 0:
             # find the oldest log file and delete it
             #s = glob.glob(self.baseFilename + ".20*")