diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-10-11 10:01:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 10:01:12 (GMT) |
| commit | 5aca34f17c4baf8e4882a7e8a827cff06ac6ef25 (patch) | |
| tree | 9950b7de50efa42b3cb53aacb1a96ff75bae0113 /Lib/logging | |
| parent | 3a58d6062060f9fcc1f4f9c43358769305bafef8 (diff) | |
| download | cpython-5aca34f17c4baf8e4882a7e8a827cff06ac6ef25.zip cpython-5aca34f17c4baf8e4882a7e8a827cff06ac6ef25.tar.gz cpython-5aca34f17c4baf8e4882a7e8a827cff06ac6ef25.tar.bz2 | |
bpo-45401: Change shouldRollover() methods to only rollover regular f… (GH-28822) (#28867)
…iles.
Also changed some historical return values from 1 -> True and 0 -> False.
(cherry picked from commit 62a667784ba7b84611ebd50fa8a1a464cde32235)
Co-authored-by: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Co-authored-by: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Diffstat (limited to 'Lib/logging')
| -rw-r--r-- | Lib/logging/handlers.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 4cabc0d..4dcbe45 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -187,14 +187,17 @@ class RotatingFileHandler(BaseRotatingHandler): Basically, see if the supplied record would cause the file to exceed the size limit we have. """ + # 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 if self.stream is None: # delay was set... self.stream = self._open() if self.maxBytes > 0: # are we rolling over? msg = "%s\n" % self.format(record) self.stream.seek(0, 2) #due to non-posix-compliant Windows feature if self.stream.tell() + len(msg) >= self.maxBytes: - return 1 - return 0 + return True + return False class TimedRotatingFileHandler(BaseRotatingHandler): """ @@ -345,10 +348,13 @@ 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: - return 1 - return 0 + return True + return False def getFilesToDelete(self): """ |