[3.10] gh-96159: Fix significant performance degradation in logging.TimedRotat… ...

Co-authored-by: Duncan Grisby <duncan-github@grisby.org>

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index b2d1f279225dfa5b889cadb484b4aa0521253c04..32c04202c5aaa36d88fa43194d86157058c7f23c 100644 (file)
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -348,11 +348,15 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
         record is not used, as we are just comparing times, but it is needed so
         the method signatures are the same
         """
-        # See bpo-45401: Never rollover anything other than regular files
-        if os.path.exists(self.baseFilename) and not os.path.isfile(self.baseFilename):
-            return False
         t = int(time.time())
         if t >= self.rolloverAt:
+            # See #89564: Never rollover anything other than regular files
+            if os.path.exists(self.baseFilename) and not os.path.isfile(self.baseFilename):
+                # The file is not a regular file, so do not rollover, but do
+                # set the next rollover time to avoid repeated checks.
+                self.rolloverAt = self.computeRollover(t)
+                return False
+
             return True
         return False
 

diff --git a/Misc/NEWS.d/next/Library/2022-08-22-18-42-17.gh-issue-96159.3bFU39.rst b/Misc/NEWS.d/next/Library/2022-08-22-18-42-17.gh-issue-96159.3bFU39.rst
new file mode 100644 (file)
index 0000000..f64469e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-08-22-18-42-17.gh-issue-96159.3bFU39.rst
@@ -0,0 +1 @@
+Fix a performance regression in logging TimedRotatingFileHandler. Only check for special files when the rollover time has passed.