add some basic logging output to certmaster

[certmaster.git] / certmaster / logger.py

diff --git a/certmaster/logger.py b/certmaster/logger.py
index bd35652..3a7e0ad 100755 (executable)
--- 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,7 +33,7 @@ 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:
@@ -59,9 +59,9 @@ class AuditLogger(Singleton):
         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):