From 23c9c26d270ff766133e7aeebffc99a35633ef41 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Tue, 15 Jan 2008 17:42:05 -0500 Subject: Simplify our modules by auto-detecting them and registering their handlers - Auto-detect and load all FuncModules. This obsoletes the need to have our modules define a register_rpc method. - Use introspection in our FuncModule to auto-register all method handlers that do not being with an underscore. This obsoletes the need to hardcode methods in our modules. - Remove all __init__ methods from our modules, along with register_rpc - Modify the func-create-module script to reflect these changes. Note that doing 'from modules import func_module' is no longer supported in our modules, do to some interesting path issues with our auto-detection code. Supported methods are now: 'import func_module' or 'from func.minion.modules import func_module' --- func/minion/modules/process.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'func/minion/modules/process.py') diff --git a/func/minion/modules/process.py b/func/minion/modules/process.py index 92c6d6a..18b5abe 100644 --- a/func/minion/modules/process.py +++ b/func/minion/modules/process.py @@ -18,19 +18,11 @@ import sub_process import codes # our modules -from modules import func_module +import func_module # ================================= class ProcessModule(func_module.FuncModule): - def __init__(self): - self.methods = { - "info" : self.info, - "kill" : self.kill, - "pkill" : self.pkill, - "mem" : self.mem - } - func_module.FuncModule.__init__(self) def info(self,flags="-auxh"): """ @@ -208,6 +200,3 @@ class ProcessModule(func_module.FuncModule): # example killall("thunderbird","-9") rc = sub_process.call(["/usr/bin/pkill", name, level], executable="/usr/bin/pkill", shell=False) return rc - -methods = ProcessModule() -register_rpc = methods.register_rpc -- cgit