From b2ea14876b07a9a2a64adbb0ddd824e15c674ffe Mon Sep 17 00:00:00 2001 From: "Krzysztof A. Adamski" Date: Sat, 2 Aug 2008 19:41:40 -0400 Subject: Adding overlord modules support. --- func/minion/modules/func_module.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'func/minion/modules/func_module.py') diff --git a/func/minion/modules/func_module.py b/func/minion/modules/func_module.py index 56f21f9..6586d40 100644 --- a/func/minion/modules/func_module.py +++ b/func/minion/modules/func_module.py @@ -15,6 +15,7 @@ import inspect from func import logger from certmaster.config import read_config, BaseConfig from func.commonconfig import FuncdConfig +import func.module_loader from func.minion.func_arg import * #the arg getter stuff class FuncModule(object): @@ -85,10 +86,7 @@ class FuncModule(object): return self.description def __is_public_valid_method(self,attr): - if inspect.ismethod(getattr(self, attr)) and attr[0] != '_' and\ - attr != 'register_rpc' and attr!='register_method_args': - return True - return False + return func.module_loader.is_public_valid_method(self, attr, blacklist=['register_rpc', 'register_method_args']) def __get_method_args(self): """ -- cgit From 17252fe8ef42fc27f922b8211178a460c8ee73f7 Mon Sep 17 00:00:00 2001 From: "Krzysztof A. Adamski" Date: Fri, 8 Aug 2008 19:13:52 -0400 Subject: Fix circular import. --- func/minion/modules/func_module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'func/minion/modules/func_module.py') diff --git a/func/minion/modules/func_module.py b/func/minion/modules/func_module.py index 6586d40..a405198 100644 --- a/func/minion/modules/func_module.py +++ b/func/minion/modules/func_module.py @@ -15,7 +15,7 @@ import inspect from func import logger from certmaster.config import read_config, BaseConfig from func.commonconfig import FuncdConfig -import func.module_loader +from func.utils import is_public_valid_method from func.minion.func_arg import * #the arg getter stuff class FuncModule(object): @@ -86,7 +86,7 @@ class FuncModule(object): return self.description def __is_public_valid_method(self,attr): - return func.module_loader.is_public_valid_method(self, attr, blacklist=['register_rpc', 'register_method_args']) + return is_public_valid_method(self, attr, blacklist=['register_rpc', 'register_method_args']) def __get_method_args(self): """ -- cgit