gh-90535: Fix support of interval>1 in logging.TimedRotatingFileHandler #116220
Conversation
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
…eHandler Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'.
serhiy-storchaka
force-pushed
the
logging-rotate-interwal
branch
from
ba423df to
c1feb41
Compare
|
@vsajip, please take a look. It is a surprisingly tiny change. |
vsajip
requested changes
Mar 14, 2024
Lib/logging/handlers.py
Outdated
| @@ -329,6 +329,10 @@ def computeRollover(self, currentTime): | |||
| else: | |||
| daysToWait = 6 - day + self.dayOfWeek + 1 | |||
| result += daysToWait * (60 * 60 * 24) | |||
| if self.when == 'MIDNIGHT': | |||
There was a problem hiding this comment.
No, because the else branch should be executed when self.when.startswith('W').
I see now that two ifs can be merged:
if self.when.startswith('W'):
day = currentDay # 0 is Monday
if day != self.dayOfWeek:
if day < self.dayOfWeek:
daysToWait = self.dayOfWeek - day
else:
daysToWait = 6 - day + self.dayOfWeek + 1
result += daysToWait * _MIDNIGHT
result += self.interval - _MIDNIGHT * 7
else:
result += self.interval - _MIDNIGHT
|
When you're done making the requested changes, leave the comment: |
|
I have made the requested changes; please review again. |
|
Thanks for making the requested changes! @vsajip: please review the changes made to this pull request. |
vsajip
approved these changes
Mar 15, 2024
serhiy-storchaka
added
needs backport to 3.11
|
Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12. |
|
Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Mar 16, 2024
…eHandler (pythonGH-116220) Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'. (cherry picked from commit 269051d) Co-authored-by: Serhiy Storchaka <[email protected]>
|
GH-116892 is a backport of this pull request to the 3.12 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Mar 16, 2024
…eHandler (pythonGH-116220) Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'. (cherry picked from commit 269051d) Co-authored-by: Serhiy Storchaka <[email protected]>
|
GH-116893 is a backport of this pull request to the 3.11 branch. |
serhiy-storchaka
added a commit
that referenced
this pull request
Mar 18, 2024
…leHandler (GH-116220) (GH-116892) Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'. (cherry picked from commit 269051d) Co-authored-by: Serhiy Storchaka <[email protected]>
serhiy-storchaka
added a commit
that referenced
this pull request
Mar 18, 2024
…leHandler (GH-116220) (GH-116893) Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'. (cherry picked from commit 269051d) Co-authored-by: Serhiy Storchaka <[email protected]>
vstinner
pushed a commit
to vstinner/cpython
that referenced
this pull request
Mar 20, 2024
…eHandler (pythonGH-116220) Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'.
adorilson
pushed a commit
to adorilson/cpython
that referenced
this pull request
Mar 25, 2024
…eHandler (pythonGH-116220) Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'.
diegorusso
pushed a commit
to diegorusso/cpython
that referenced
this pull request
Apr 17, 2024
…eHandler (pythonGH-116220) Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'.