Changeset 5915 for branches/newapi

Timestamp:

12/02/07 20:58:20 (12 months ago)

Author:

erijo

Message:

Added PluginManager::setPluginLogSink for setting the LogSink? that
plugins will log to.

Location:

branches/newapi/licq/src

Files:

• daemon.cpp (modified) (2 diffs)
• main.cpp (modified) (2 diffs)
• plugin/pluginmanager.h (modified) (1 diff)
• plugin/pluginmanagerimpl.cpp (modified) (4 diffs)
• plugin/pluginmanagerimpl.h (modified) (2 diffs)

branches/newapi/licq/src/daemon.cpp

@@ -176 +176 @@
   if (vm.count("plugin"))
   {
+    PluginManager* pluginManager = PluginManager::getInstance();
+
     std::vector<std::string>
         plugins = vm["plugin"].as< std::vector<std::string> >();
@@ -181 +183 @@
          it != plugins.end(); ++it)
     {
-      /*
-      Licq::Plugin::Id
-          id = myPluginManager->loadPlugin(*it, myLogDistributor, 0, NULL);
+      Licq::Plugin::Id id = pluginManager->loadPlugin(*it, 0, NULL);
       myLog.debug(tr("Loaded plugin %1% with id %2%") % *it % id);
-      */
     }
   }

branches/newapi/licq/src/main.cpp

@@ -10 +10 @@
 #include "licq/exception/exception.h"
 #include "licq/exception/invalidargumentexception.h"
+#include "plugin/pluginmanager.h"
 #include "util/log.h"
 #include "util/logdistributor.h"
@@ -64 +65 @@
   if (!isatty(STDERR_FILENO))
     streamLogSink.setUseColors(false);
+
+  // Configure PluginManager
+  LicqDaemon::PluginManager::getInstance()->setPluginLogSink(&logDistributor);
 
   // Fail if argv[0] isn't set

branches/newapi/licq/src/plugin/pluginmanager.h

@@ -49 +49 @@
   static PluginManager* getInstance();
 
+  virtual void setPluginLogSink(Licq::LogSink* sink) = 0;
+
   virtual void getPluginInformation(
     std::vector< boost::shared_ptr<const Licq::Plugin::Information> >* info) = 0;
 
   virtual Licq::Plugin::Id
-  loadPlugin(const std::string& filename,
-             Licq::LogSink& sink,
-             int argc, char** argv) = 0;
+  loadPlugin(const std::string& filename, int argc, char** argv) = 0;
 
   virtual PluginCache* getPluginCache() const = 0;

branches/newapi/licq/src/plugin/pluginmanagerimpl.cpp

@@ -23 +23 @@
 
 LicqDaemon::PluginManagerImpl::PluginManagerImpl(PluginCache& cache)
-  : myCache(cache)
+  : myCache(cache),
+    myPluginLogSink(NULL)
 {
   // Empty
@@ -31 +32 @@
 {
   // Empty
+}
+
+void LicqDaemon::PluginManagerImpl::setPluginLogSink(Licq::LogSink* sink)
+{
+  assert(myPluginLogSink == NULL);
+  myPluginLogSink = sink;
 }
 
@@ -45 +52 @@
 
 Licq::Plugin::Id LicqDaemon::PluginManagerImpl::
-loadPlugin(const std::string& filename,
-           Licq::LogSink& sink,
-           int argc, char** argv)
+loadPlugin(const std::string& filename, int argc, char** argv)
 {
+  assert(myPluginLogSink != NULL);
+
   const size_t index = myCache.getIndex(filename);
 
@@ -57 +64 @@
 
   boost::shared_ptr<PluginInstance>
-      instance(new PluginInstanceImpl(info, lib, sink));
+      instance(new PluginInstanceImpl(info, lib, *myPluginLogSink));
 
   Licq::Plugin::Id id = instance->load(argc, argv);

branches/newapi/licq/src/plugin/pluginmanagerimpl.h

@@ -40 +40 @@
   ~PluginManagerImpl();
 
+  /**
+   * Set the LogSink that plugins will log to. This must have been
+   * called before the first call to loadPlugin().
+   */
+  void setPluginLogSink(Licq::LogSink* sink);
+
   void getPluginInformation(
     std::vector< boost::shared_ptr<const Licq::Plugin::Information> >* info);
 
-  Licq::Plugin::Id loadPlugin(const std::string& filename,
-                              Licq::LogSink& sink,
-                              int argc, char** argv);
+  Licq::Plugin::Id
+    loadPlugin(const std::string& filename, int argc, char** argv);
 
   /**
@@ -54 +59 @@
 private:
   PluginCache& myCache;
+  Licq::LogSink* myPluginLogSink;
   
   typedef std::map<Licq::Plugin::Id,