From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 21 Jan 2011 23:35:57 +0000 (+0000)
Subject: Issue #10949: Improved robustness of rotating file handlers.
X-Git-Tag: v3.2rc2~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01241d6c358ba55332c1ba91c65157548349bdc8;p=thirdparty%2FPython%2Fcpython.git

Issue #10949: Improved robustness of rotating file handlers.
---

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 96cdcc65e08d..96384bd7f7ec 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -120,6 +120,7 @@ class RotatingFileHandler(BaseRotatingHandler):
         """
         if self.stream:
             self.stream.close()
+            self.stream = None
         if self.backupCount > 0:
             for i in range(self.backupCount - 1, 0, -1):
                 sfn = "%s.%d" % (self.baseFilename, i)
@@ -316,6 +317,7 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
         """
         if self.stream:
             self.stream.close()
+            self.stream = None
         # get the time that this sequence started at and make it a TimeTuple
         t = self.rolloverAt - self.interval
         if self.utc:
diff --git a/Misc/NEWS b/Misc/NEWS
index 44d39cf71d10..0ae7d7d80030 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #10949: Improved robustness of rotating file handlers.
+
 - Issue #10955: Fix a potential crash when trying to mmap() a file past its
   length.  Initial patch by Ross Lagerwall.