X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;ds=sidebyside;f=certmaster%2Flogger.py;h=f5d79c6c25d2b123efe1bc6dd173c9973166ab14;hb=refs%2Fheads%2Fmaster;hp=3a7e0ad4e493eb04be5f33860d2adc6ed5d51cce;hpb=6146feb4b676ba7e10f5f175bb50149c20c53b18;p=certmaster.git diff --git a/certmaster/logger.py b/certmaster/logger.py old mode 100755 new mode 100644 index 3a7e0ad..f5d79c6 --- a/certmaster/logger.py +++ b/certmaster/logger.py @@ -33,14 +33,14 @@ class Logger(Singleton): def __init__(self, logfilepath ="/var/log/certmaster/certmaster.log"): config_file = '/etc/certmaster/minion.conf' - self.config = read_config(config_file, CMConfig) + self.config = read_config(config_file, CMConfig) self.loglevel = logging._levelNames[self.config.log_level] self._setup_logging() if self._no_handlers: self._setup_handlers(logfilepath=logfilepath) - + def _setup_logging(self): - self.logger = logging.getLogger("svc") + self.logger = logging.getLogger("certmaster") def _setup_handlers(self, logfilepath="/var/log/certmaster/certmaster.log"): handler = logging.FileHandler(logfilepath, "a") @@ -54,6 +54,7 @@ class Logger(Singleton): class AuditLogger(Singleton): _no_handlers = True def __init__(self, logfilepath = "/var/log/certmaster/audit.log"): + self.logfilepath = logfilepath self.loglevel = logging.INFO self._setup_logging() if self._no_handlers: @@ -65,7 +66,7 @@ class AuditLogger(Singleton): def _setup_logging(self): - self.logger = logging.getLogger("audit") + self.logger = logging.getLogger("certmaster-audit") def _setup_handlers(self, logfilepath="/var/log/certmaster/audit.log"): handler = logging.FileHandler(logfilepath, "a")