projects
/
certmaster.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pushing changes as part of certmaster split
[certmaster.git]
/
certmaster
/
logger.py
diff --git
a/certmaster/logger.py
b/certmaster/logger.py
index
bd35652
..
b2d14ed
100755
(executable)
--- a/
certmaster/logger.py
+++ b/
certmaster/logger.py
@@
-14,8
+14,8
@@
import logging
import logging
-from c
ertmaster.c
onfig import read_config
-from c
ertmaster.commonconfig import Certmaster
Config
+from config import read_config
+from c
ommonconfig import CM
Config
# from the comments in http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66531
# 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'
def __init__(self, logfilepath ="/var/log/certmaster/certmaster.log"):
config_file = '/etc/certmaster/minion.conf'
- self.config = read_config(config_file, C
ertMaster
Config)
+ self.config = read_config(config_file, C
M
Config)
self.loglevel = logging._levelNames[self.config.log_level]
self._setup_logging()
if self._no_handlers:
self.loglevel = logging._levelNames[self.config.log_level]
self._setup_logging()
if self._no_handlers: