diff options
| author | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-27 17:22:00 -0400 |
|---|---|---|
| committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-27 17:22:00 -0400 |
| commit | 55bf7929f943c4ba2987e47392a517ae1b47eb81 (patch) | |
| tree | 62be9093923a7402a608f3ea91b665d112834e93 /modules | |
| parent | 5d637b53c5853b35c308a284956c9f1dd637c43a (diff) | |
| download | third_party-func-55bf7929f943c4ba2987e47392a517ae1b47eb81.tar.gz third_party-func-55bf7929f943c4ba2987e47392a517ae1b47eb81.tar.xz third_party-func-55bf7929f943c4ba2987e47392a517ae1b47eb81.zip | |
really nice if I'd stop dropping 'i' out of config_file
Diffstat (limited to 'modules')
| -rwxr-xr-x | modules/func_module.py | 9 |
1 files changed, 5 insertions, 4 deletions
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 |