Add dbus interface

[collecty.git] / src / collecty / daemon.py

diff --git a/src/collecty/daemon.py b/src/collecty/daemon.py
index e678899e7f91f3f345b6dc5648f3dcb7ab5245d9..2fa000f0e45ef03aca0400cda3f9207f0001f6ff 100644 (file)
--- a/src/collecty/daemon.py
+++ b/src/collecty/daemon.py
@@ -25,6 +25,7 @@ import signal
 import threading
 import time
 
+import bus
 import plugins
 
 from constants import *
@@ -55,6 +56,10 @@ class Collecty(object):
                # will be written to disk later.
                self.write_queue = WriteQueue(self, self.SUBMIT_INTERVAL)
 
+               # Create a thread that connects to dbus and processes requests we
+               # get from there.
+               self.bus = bus.Bus(self)
+
                # Add all plugins
                for plugin in plugins.get():
                        self.add_plugin(plugin)
@@ -73,10 +78,19 @@ class Collecty(object):
 
                self.plugins.append(plugin)
 
+       @property
+       def templates(self):
+               for plugin in self.plugins:
+                       for template in plugin.templates:
+                               yield template
+
        def run(self):
                # Register signal handlers.
                self.register_signal_handler()
 
+               # Start the bus
+               self.bus.start()
+
                # Start all data source threads.
                for p in self.plugins:
                        p.start()
@@ -96,6 +110,9 @@ class Collecty(object):
                for p in self.plugins:
                        p.join()
 
+               # Stop the bus thread
+               self.bus.shutdown()
+
                # Write all collected data to disk before ending the main thread
                self.write_queue.shutdown()
 
@@ -129,9 +146,19 @@ class Collecty(object):
                        # Commit all data.
                        self.write_queue.commit()
 
-       @property
-       def graph_default_arguments(self):
-               return GRAPH_DEFAULT_ARGUMENTS
+       def get_plugin_from_template(self, template_name):
+               for plugin in self.plugins:
+                       if not template_name in [t.name for t in plugin.templates]:
+                               continue
+
+                       return plugin
+
+       def generate_graph(self, template_name, *args, **kwargs):
+               plugin = self.get_plugin_from_template(template_name)
+               if not plugin:
+                       raise RuntimeError("Could not find template %s" % template_name)
+
+               return plugin.generate_graph(template_name, *args, **kwargs)
 
 
 class WriteQueue(threading.Thread):