X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;f=certmaster%2Flogger.py;h=3ff9d42bf128011da3b2b39c849653014bedc18b;hb=90a4cc7e4914331d9a0281d24434f24518c1c291;hp=b2d14ed8d8de2a1f3b26e10b4881a379cee2a328;hpb=d6dfdb25c4e8be31d77ba8db7c3499e3f10e0c4b;p=certmaster.git

diff --git a/certmaster/logger.py b/certmaster/logger.py
old mode 100755
new mode 100644
index b2d14ed..3ff9d42
--- a/certmaster/logger.py
+++ b/certmaster/logger.py
@@ -40,7 +40,7 @@ class Logger(Singleton):
             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")