FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-159690: Fix TimedRotatingFileHandler stopping rollovers after a failed or skipped rollover by lazerg · Pull Request #159691 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-159690: Fix TimedRotatingFileHandler stopping rollovers after a failed or skipped rollover #159691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lazerg wants to merge 2 commits into from
Conversation 1 Commits 2 Checks 49 Files changed
Closed

gh-159690: Fix TimedRotatingFileHandler stopping rollovers after a failed or skipped rollover #159691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81719a9
gh-159690: Fix TimedRotatingFileHandler stopping rollovers after a fa…
lazerg Oct 19, 2026
0958ee0
Use os_helper.create_empty_file() in the test
lazerg Oct 19, 2026
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion Lib/logging/handlers.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ def doRollover(self):
timeTuple = time.localtime(t + addend)
dfn = self.rotation_filename(self.baseFilename + "." +
time.strftime(self.suffix, timeTuple))
self.rolloverAt = self.computeRollover(currentTime)
if os.path.exists(dfn):
# Already rolled over.
return
Expand All @@ -482,7 +483,6 @@ def doRollover(self):
os.remove(s)
if not self.delay:
self.stream = self._open()
self.rolloverAt = self.computeRollover(currentTime)

class WatchedFileHandler(logging.FileHandler):
"""
Expand Down
26 changes: 26 additions & 0 deletions Lib/test/test_logging.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -6902,6 +6902,32 @@ def test_rollover_at_midnight(self, weekly=False):
def test_rollover_at_weekday(self):
self.test_rollover_at_midnight(weekly=True)

def test_rollover_backup_exists(self):
fh = logging.handlers.TimedRotatingFileHandler(
self.fn, 'S', encoding="utf-8", delay=True, utc=True)
self.addCleanup(fh.close)
rolloverAt = fh.rolloverAt
dfn = self.fn + time.strftime(".%Y-%m-%d_%H-%M-%S",
time.gmtime(rolloverAt - 1))
os_helper.create_empty_file(dfn)
self.rmfiles.append(dfn)
with patch('time.time', return_value=rolloverAt):
fh.doRollover()
self.assertEqual(fh.rolloverAt, rolloverAt + 1)

def test_rollover_error(self):
fh = logging.handlers.TimedRotatingFileHandler(
self.fn, 'S', encoding="utf-8", utc=True)
self.addCleanup(fh.close)
rolloverAt = fh.rolloverAt
dfn = self.fn + time.strftime(".%Y-%m-%d_%H-%M-%S",
time.gmtime(rolloverAt - 1))
self.rmfiles.append(dfn)
with (patch('time.time', return_value=rolloverAt),
patch.object(fh, '_open', side_effect=OSError)):
self.assertRaises(OSError, fh.doRollover)
self.assertEqual(fh.rolloverAt, rolloverAt + 1)

def test_invalid(self):
assertRaises = self.assertRaises
assertRaises(ValueError, logging.handlers.TimedRotatingFileHandler,
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2026-10-19-02-38-17.gh-issue-159690.d1hW68.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :class:`logging.handlers.TimedRotatingFileHandler` so that it no longer
stops rolling over when a rollover fails or its backup file already exists.
Loading
Back | FazBrowse Home | New Git URL