X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;f=certmaster%2Flogger.py;h=3ff9d42bf128011da3b2b39c849653014bedc18b;hb=42050df52ff80295e1cf64e6ba36b793b09412cf;hp=bd35652b77734a43fd63506c527c9e68e81d3dda;hpb=a419c0fb6d0456a058462ea31f76fbdbeac63d99;p=certmaster.git

diff --git a/certmaster/logger.py b/certmaster/logger.py
old mode 100755
new mode 100644
index bd35652..3ff9d42
--- a/certmaster/logger.py
+++ b/certmaster/logger.py
@@ -14,8 +14,8 @@
 
 
 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
@@ -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, 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")
@@ -54,18 +54,19 @@ 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:
             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")