fix error in secop.logging
Implement LogfileHandler.getChild. This is needed to inherit the configured level from the parent handler. + remove redundant assignmet of logfile_handler.max_days Change-Id: I7277c28221bbb6108d75f2437634e9db9bf6761e Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28140 Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de> Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
parent
6460e51920
commit
7891c281e1
@ -86,7 +86,6 @@ class RemoteLogHandler(mlzlog.Handler):
|
||||
class LogfileHandler(mlzlog.LogfileHandler):
|
||||
|
||||
def __init__(self, logdir, rootname, max_days=0):
|
||||
self.logdir = logdir
|
||||
self.rootname = rootname
|
||||
self.max_days = max_days
|
||||
super().__init__(logdir, rootname)
|
||||
@ -95,6 +94,11 @@ class LogfileHandler(mlzlog.LogfileHandler):
|
||||
if record.levelno != COMLOG:
|
||||
super().emit(record)
|
||||
|
||||
def getChild(self, name):
|
||||
child = type(self)(dirname(self.baseFilename), name, self.max_days)
|
||||
child.setLevel(self.level)
|
||||
return child
|
||||
|
||||
def doRollover(self):
|
||||
super().doRollover()
|
||||
if self.max_days:
|
||||
@ -157,8 +161,6 @@ class MainLogger:
|
||||
if self.logdir:
|
||||
logfile_days = generalConfig.getint('logfile_days')
|
||||
logfile_handler = LogfileHandler(self.logdir, self.rootname, max_days=logfile_days)
|
||||
if generalConfig.logfile_days:
|
||||
logfile_handler.max_days = int(generalConfig.logfile_days)
|
||||
logfile_handler.setLevel(LOG_LEVELS[generalConfig.get('logfile_level', 'info')])
|
||||
self.log.addHandler(logfile_handler)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user