From 55bf7929f943c4ba2987e47392a517ae1b47eb81 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Thu, 27 Sep 2007 17:22:00 -0400 Subject: really nice if I'd stop dropping 'i' out of config_file --- minion/logger.py | 2 +- minion/server.py | 2 +- modules/func_module.py | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/minion/logger.py b/minion/logger.py index 9e8b62d..169d508 100755 --- a/minion/logger.py +++ b/minion/logger.py @@ -35,7 +35,7 @@ class Logger(Singleton): _no_handlers = True def __init__(self, logfilepath ="/var/log/func/func.log"): - config_fle = '/etc/func/minion.conf' + config_file = '/etc/func/minion.conf' self.config = read_config(config_file, FuncdConfig) self.loglevel = logging._levelNames[self.config.log_level] self._setup_logging() diff --git a/minion/server.py b/minion/server.py index af4c4e0..f930cfa 100755 --- a/minion/server.py +++ b/minion/server.py @@ -49,7 +49,7 @@ class XmlRpcInterface(object): Constructor. """ - config_fle = '/etc/func/minion.conf' + config_file = '/etc/func/minion.conf' self.config = read_config(config_file, FuncdConfig) self.logger = logger.Logger().logger self.audit_logger = logger.AuditLogger() diff --git a/modules/func_module.py b/modules/func_module.py index f488e83..2f56ca0 100755 --- a/modules/func_module.py +++ b/modules/func_module.py @@ -13,8 +13,10 @@ ## -from func import config_data +from func import config from func import logger +from func.config import read_config +from func.server import FuncdConfig class FuncModule(object): @@ -26,9 +28,8 @@ class FuncModule(object): def __init__(self): - config_obj = config_data.Config() - config_result = config_obj.get() - self.config = config_result + config_file = '/etc/func/minion.conf' + self.config = read_config(config_file, FuncdConfig) self.__init_log() self.__base_methods = { # __'s so we don't clobber useful names -- cgit