From 23c9c26d270ff766133e7aeebffc99a35633ef41 Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@redhat.com>
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/reboot.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'func/minion/modules/reboot.py')

diff --git a/func/minion/modules/reboot.py b/func/minion/modules/reboot.py
index 8772b8f..0af78f9 100644
--- a/func/minion/modules/reboot.py
+++ b/func/minion/modules/reboot.py
@@ -8,22 +8,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-from modules import func_module
-
+import func_module
 import sub_process
 
 class Reboot(func_module.FuncModule):
 
-    def __init__(self):
-        self.methods = {
-                "reboot" : self.reboot
-        }
-        func_module.FuncModule.__init__(self)
-
     def reboot(self, when='now', message=''):
         return sub_process.call(["/sbin/shutdown", '-r', when, message])
-
-
-methods = Reboot()
-register_rpc = methods.register_rpc
-- 
cgit