From 0b485cd81352fb5416276842eb8b3e5bb14dd68d Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@redhat.com>
Date: Fri, 16 Jul 2010 11:39:41 -0400
Subject: [PATCH] reimplement scanPlugin() as a wrapper around findHandlers()

---
 builder/kojid  | 2 +-
 koji/daemon.py | 4 ++++
 vm/kojivmd     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/builder/kojid b/builder/kojid
index a7609a11..87729a3f 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -75,7 +75,7 @@ def main(options, session):
         pt = koji.plugin.PluginTracker(path=options.pluginpath.split(':'))
         for name in options.plugin:
             logger.info('Loading plugin: %s' % name)
-            tm.findHandlers(vars(pt.load(name)))
+            tm.scanPlugin(pt.load(name))
     def shutdown(*args):
         raise SystemExit
     signal.signal(signal.SIGTERM,shutdown)
diff --git a/koji/daemon.py b/koji/daemon.py
index 5b91089f..d46abb55 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -435,6 +435,10 @@ class TaskManager(object):
                 for method in v.Methods:
                     self.handlers[method] = v
 
+    def scanPlugin(self, plugin):
+        """Find task handlers in a plugin"""
+        self.findHandlers(vars(plugin))
+
     def shutdown(self):
         """Attempt to shut down cleanly"""
         for task_id in self.pids.keys():
diff --git a/vm/kojivmd b/vm/kojivmd
index c2993789..a3ecad1f 100755
--- a/vm/kojivmd
+++ b/vm/kojivmd
@@ -175,7 +175,7 @@ def main(options, session):
         pt = koji.plugin.PluginTracker(path=options.pluginpath.split(':'))
         for name in options.plugin:
             logger.info('Loading plugin: %s' % name)
-            tm.findHandlers(vars(pt.load(name)))
+            tm.scanPlugin(pt.load(name))
     def shutdown(*args):
         raise SystemExit
     signal.signal(signal.SIGTERM,shutdown)