Skip to content

gh-90535: Fix support of interval>1 in logging.TimedRotatingFileHandler#116220

Merged
serhiy-storchaka merged 3 commits intopython:mainfrom
serhiy-storchaka:logging-rotate-interwal
Mar 16, 2024
Merged

gh-90535: Fix support of interval>1 in logging.TimedRotatingFileHandler#116220
serhiy-storchaka merged 3 commits intopython:mainfrom
serhiy-storchaka:logging-rotate-interwal

Conversation

@serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Mar 1, 2024 •
edited by bedevere-app bot
Loading

Fix support of interval values > 1 in logging.TimedRotatingFileHandler for when='MIDNIGHT' and when='Wx'.

@serhiy-storchaka serhiy-storchaka requested a review from vsajip as a code owner March 1, 2024 18:26
@bedevere-app bedevere-app bot mentioned this pull request Mar 1, 2024
Closed
@serhiy-storchaka
pythongh-90535: Fix support of interval>1 in logging.TimedRotatingFil…
c1feb41 
…eHandler

Fix support of interval values > 1 in logging.TimedRotatingFileHandler
for when='MIDNIGHT' and when='Wx'.
@serhiy-storchaka serhiy-storchaka force-pushed the logging-rotate-interwal branch from ba423df to c1feb41 Compare March 1, 2024 18:29
@serhiy-storchaka serhiy-storchaka mentioned this pull request Mar 13, 2024
Closed
@serhiy-storchaka
Copy link
Member Author

serhiy-storchaka commented Mar 13, 2024

@vsajip, please take a look. It is a surprisingly tiny change.

vsajip
vsajip requested changes Mar 14, 2024
View reviewed changes
Copy link
Member

@vsajip vsajip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one minor suggestion. Otherwise looks fine. Thank you very much for all your work on TimedRotatingFileHandler, Serhiy!

Lib/logging/handlers.py Outdated
else:
daysToWait = 6 - day + self.dayOfWeek + 1
result += daysToWait * (60 * 60 * 24)
if self.when == 'MIDNIGHT':
Copy link
Member

@vsajip vsajip Mar 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be an elif, right?

Copy link
Member Author

@serhiy-storchaka serhiy-storchaka Mar 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bedevere-app
Copy link

bedevere-app bot commented Mar 14, 2024

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

@serhiy-storchaka
Copy link
Member Author

serhiy-storchaka commented Mar 15, 2024

I have made the requested changes; please review again.

@bedevere-app
Copy link

bedevere-app bot commented Mar 15, 2024

Thanks for making the requested changes!

@vsajip: please review the changes made to this pull request.

@bedevere-app bedevere-app bot requested a review from vsajip March 15, 2024 11:21
@serhiy-storchaka serhiy-storchaka merged commit 269051d into python:main Mar 16, 2024
@serhiy-storchaka serhiy-storchaka deleted the logging-rotate-interwal branch March 16, 2024 10:29
@serhiy-storchaka serhiy-storchaka added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Mar 16, 2024
@miss-islington-app
Copy link

miss-islington-app bot commented Mar 16, 2024

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link

miss-islington-app bot commented Mar 16, 2024

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
@serhiy-storchaka @miss-islington
pythongh-90535: Fix support of interval>1 in logging.TimedRotatingFil…
e287d64 
…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 <storchaka@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Mar 16, 2024

GH-116892 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 only security fixes label Mar 16, 2024
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 16, 2024
@serhiy-storchaka @miss-islington
pythongh-90535: Fix support of interval>1 in logging.TimedRotatingFil…
8d01ea9 
…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 <storchaka@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Mar 16, 2024

GH-116893 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Mar 16, 2024
serhiy-storchaka added a commit that referenced this pull request Mar 18, 2024
@miss-islington @serhiy-storchaka
[3.12] gh-90535: Fix support of interval>1 in logging.TimedRotatingFi…
547e882 
…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 <storchaka@gmail.com>
serhiy-storchaka added a commit that referenced this pull request Mar 18, 2024
@miss-islington @serhiy-storchaka
[3.11] gh-90535: Fix support of interval>1 in logging.TimedRotatingFi…
3b4cd48 
…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 <storchaka@gmail.com>
vstinner pushed a commit to vstinner/cpython that referenced this pull request Mar 20, 2024
@serhiy-storchaka @vstinner
pythongh-90535: Fix support of interval>1 in logging.TimedRotatingFil…
194525b 
…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
@serhiy-storchaka @adorilson
pythongh-90535: Fix support of interval>1 in logging.TimedRotatingFil…
e23055d 
…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
@serhiy-storchaka @diegorusso
pythongh-90535: Fix support of interval>1 in logging.TimedRotatingFil…
e65ef53 
…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

Reviewers

@vsajip vsajip vsajip approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@serhiy-storchaka @vsajip