summaryrefslogtreecommitdiffstats
path: root/certmaster/logger.py
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-02-25 16:48:47 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-02-25 16:48:47 -0500
commitd6dfdb25c4e8be31d77ba8db7c3499e3f10e0c4b (patch)
tree6e74c94d279a70fcbb0619030d416d0365f5c21a /certmaster/logger.py
parent9713ae6bad871bc151d378d3d837f09d6e646832 (diff)
downloadcertmaster-d6dfdb25c4e8be31d77ba8db7c3499e3f10e0c4b.tar.gz
certmaster-d6dfdb25c4e8be31d77ba8db7c3499e3f10e0c4b.tar.xz
certmaster-d6dfdb25c4e8be31d77ba8db7c3499e3f10e0c4b.zip
Pushing changes as part of certmaster split
Diffstat (limited to 'certmaster/logger.py')
-rwxr-xr-xcertmaster/logger.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/certmaster/logger.py b/certmaster/logger.py
index bd35652..b2d14ed 100755
--- 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: