import logging
-from certmaster.config import read_config
-from certmaster.commonconfig import CertmasterConfig
+from config import read_config
+from commonconfig import CMConfig
# from the comments in http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66531
def __init__(self, logfilepath ="/var/log/certmaster/certmaster.log"):
config_file = '/etc/certmaster/minion.conf'
- self.config = read_config(config_file, CertMasterConfig)
+ 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")
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:
self._setup_handlers(logfilepath=logfilepath)
- def log_call(self, ip, CN, cert_hash, method, params):
+ def log_call(self, ip, method, params):
# square away a good parseable format at some point -akl
- self.logger.info("%s %s %s %s called with %s" % (ip, CN, cert_hash, method, params))
+ self.logger.info("%s called %s with %s" % (ip, method, params))
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")