reimplement scanPlugin() as a wrapper around findHandlers()

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)

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():

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)