oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use log extension for rolled log file names

Browse source
This commit is contained in:
shortcutme 2019-03-16 02:44:22 +01:00
parent 9b2cae8e33
commit db8f9988eb
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Config.py
View file

@ -545,18 +545,26 @@ class Config(object):
console_logger.setLevel(level) console_logger.setLevel(level)
logging.getLogger('').addHandler(console_logger) logging.getLogger('').addHandler(console_logger)
def fileLogNamer(self, filename):
return re.sub(r"\.log\.(.*?)$", ".\\1.log", filename)
def initFileLogger(self): def initFileLogger(self):
if self.action == "main": if self.action == "main":
log_file_path = "%s/debug.log" % self.log_dir log_file_path = "%s/debug.log" % self.log_dir
else: else:
log_file_path = "%s/cmd.log" % self.log_dir log_file_path = "%s/cmd.log" % self.log_dir
if self.log_rotate == "off": if self.log_rotate == "off":
file_logger = logging.FileHandler(log_file_path) file_logger = logging.FileHandler(log_file_path, "w", "utf-8")
else: else:
when_names = {"weekly": "w", "daily": "d", "hourly": "h"} when_names = {"weekly": "w", "daily": "d", "hourly": "h"}
file_logger = logging.handlers.TimedRotatingFileHandler( file_logger = logging.handlers.TimedRotatingFileHandler(
log_file_path, when=when_names[self.log_rotate], interval=1, backupCount=self.log_rotate_backup_count log_file_path, when=when_names[self.log_rotate], interval=1, backupCount=self.log_rotate_backup_count,
encoding="utf8"
) )
file_logger.namer = self.fileLogNamer
if os.path.isfile(log_file_path):
file_logger.doRollover() # Always start with empty log file file_logger.doRollover() # Always start with empty log file
file_logger.setFormatter(logging.Formatter('[%(asctime)s] %(levelname)-8s %(name)s %(message)s')) file_logger.setFormatter(logging.Formatter('[%(asctime)s] %(levelname)-8s %(name)s %(message)s'))
file_logger.setLevel(logging.getLevelName(self.log_level)) file_logger.setLevel(logging.getLevelName(self.log_level))