added XML-RPC RMI capabilities to FileMonitor objects

3 files changed, 21 insertions, 10 deletions

diff --git a/src/lib/Bcfg2/SSLServer.py b/src/lib/Bcfg2/SSLServer.py
index 5e3c6232a..a149b676f 100644
--- a/src/lib/Bcfg2/SSLServer.py
+++ b/src/lib/Bcfg2/SSLServer.py
@@ -403,12 +403,9 @@ class XMLRPCServer(SocketServer.ThreadingMixIn, SSLServer,
             name = instance.name
         except AttributeError:
             name = "unknown"
-        if hasattr(instance, 'plugins'):
-            for pname, pinst in list(instance.plugins.items()):
-                for mname in pinst.__rmi__:
-                    xmname = "%s.%s" % (pname, mname)
-                    fn = getattr(pinst, mname)
-                    self.register_function(fn, name=xmname)
+        if hasattr(instance, '_get_rmi'):
+            for fname, func in instance._get_rmi().items():
+                self.register_function(func, name=fname)
         self.logger.info("serving %s at %s" % (name, self.url))
 
     def serve_forever(self):
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 6f642e347..96100dae4 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -876,10 +876,12 @@ class BaseCore(object):
     def _get_rmi(self):
         """ Get a list of RMI calls exposed by plugins """
         rmi = dict()
-        if self.plugins:
-            for pname, pinst in list(self.plugins.items()):
-                for mname in pinst.__rmi__:
-                    rmi["%s.%s" % (pname, mname)] = getattr(pinst, mname)
+        for pname, pinst in list(self.plugins.items()):
+            for mname in pinst.__rmi__:
+                rmi["%s.%s" % (pname, mname)] = getattr(pinst, mname)
+        famname = self.fam.__class__.__name__
+        for mname in self.fam.__rmi__:
+            rmi["%s.%s" % (famname, mname)] = getattr(self.fam, mname)
         return rmi
 
     def _resolve_exposed_method(self, method_name):
diff --git a/src/lib/Bcfg2/Server/FileMonitor/__init__.py b/src/lib/Bcfg2/Server/FileMonitor/__init__.py
index 42ad4c041..58144958e 100644
--- a/src/lib/Bcfg2/Server/FileMonitor/__init__.py
+++ b/src/lib/Bcfg2/Server/FileMonitor/__init__.py
@@ -116,6 +116,9 @@ class FileMonitor(Debuggable):
     #: should have higher priorities.
     __priority__ = -1
 
+    #: List of names of methods to be exposed as XML-RPC functions
+    __rmi__ = Debuggable.__rmi__ + ["list_event_handlers"]
+
     def __init__(self, ignore=None, debug=False):
         """
         :param ignore: A list of filename globs describing events that
@@ -310,6 +313,15 @@ class FileMonitor(Debuggable):
         """
         raise NotImplementedError
 
+    def list_event_handlers(self):
+        """ XML-RPC that returns
+        :attr:`Bcfg2.Server.FileMonitor.FileMonitor.handles` for
+        debugging purposes. """
+        rv = dict()
+        for watch, handler in self.handles.items():
+            rv[watch] = getattr(handler, "name", handler.__class__.__name__)
+        return rv
+
 
 #: A dict of all available FAM backends.  Keys are the human-readable
 #: names of the backends, which are used in bcfg2.conf to select a