CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix log rotation in Red (#4738)

Browse Source 
* Fix log rotation in Red

* Update regexes to only work with single digit suffixes
This commit is contained in:
jack1142 2021-01-23 21:04:03 +01:00 committed by GitHub
parent db20cad395
commit 69c8781cec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
redbot/logging.py
View File

@ -58,7 +58,7 @@ class RotatingFileHandler(logging.handlers.RotatingFileHandler):
self.baseStem = stem self.baseStem = stem
self.directory = directory.resolve() self.directory = directory.resolve()
# Scan for existing files in directory, append to last part of existing log # Scan for existing files in directory, append to last part of existing log
log_part_re = re.compile(rf"{stem}-part(?P<partnum>\d+).log") log_part_re = re.compile(rf"{stem}-part(?P<partnum>\d)\.log")
highest_part = 0 highest_part = 0
for path in directory.iterdir(): for path in directory.iterdir():
match = log_part_re.match(path.name) match = log_part_re.match(path.name)
@ -86,7 +86,7 @@ class RotatingFileHandler(logging.handlers.RotatingFileHandler):
initial_path.replace(self.directory / f"{self.baseStem}-part1.log") initial_path.replace(self.directory / f"{self.baseStem}-part1.log")
match = re.match( match = re.match(
rf"{self.baseStem}(?:-part(?P<part>\d+)?)?.log", pathlib.Path(self.baseFilename).name rf"{self.baseStem}(?:-part(?P<part>\d))?\.log", pathlib.Path(self.baseFilename).name
) )
latest_part_num = int(match.groupdict(default="1").get("part", "1")) latest_part_num = int(match.groupdict(default="1").get("part", "1"))
if self.backupCount < 1: if self.backupCount < 1:
@ -95,7 +95,7 @@ class RotatingFileHandler(logging.handlers.RotatingFileHandler):
elif latest_part_num > self.backupCount: elif latest_part_num > self.backupCount:
# Rotate files down one # Rotate files down one
# red-part2.log becomes red-part1.log etc, a new log is added at the end. # red-part2.log becomes red-part1.log etc, a new log is added at the end.
for i in range(1, self.backupCount): for i in range(1, self.backupCount + 1):
next_log = self.directory / f"{self.baseStem}-part{i + 1}.log" next_log = self.directory / f"{self.baseStem}-part{i + 1}.log"
if next_log.exists(): if next_log.exists():
prev_log = self.directory / f"{self.baseStem}-part{i}.log" prev_log = self.directory / f"{self.baseStem}-part{i}.log"