diff options
| author | Adrian Likins <alikins@redhat.com> | 2007-09-27 17:15:38 -0400 |
|---|---|---|
| committer | Adrian Likins <alikins@redhat.com> | 2007-09-27 17:15:38 -0400 |
| commit | aac0784a0f84c848f47955c57d6fe0dcbd49c035 (patch) | |
| tree | b8e87b66a2886906025b635e5f088cbad5de23a7 /modules/func_module.py | |
| parent | 9d94991f51d2e0986fbc933522e32621c2c37a36 (diff) | |
| parent | 05f84c547f8eadb46f70abc9f612a21225ed5994 (diff) | |
| download | third_party-func-aac0784a0f84c848f47955c57d6fe0dcbd49c035.tar.gz third_party-func-aac0784a0f84c848f47955c57d6fe0dcbd49c035.tar.xz third_party-func-aac0784a0f84c848f47955c57d6fe0dcbd49c035.zip | |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Diffstat (limited to 'modules/func_module.py')
| -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 |