Changeset 5897 for branches/newapi

Timestamp:

12/02/07 02:15:44 (12 months ago)

Author:

erijo

Message:

Use thread log for daemon.

Location:

branches/newapi/licq/src

Files:

• daemon.cpp (modified) (7 diffs)
• daemon.h (modified) (4 diffs)
• main.cpp (modified) (4 diffs)

branches/newapi/licq/src/daemon.cpp

@@ -26 +26 @@
 #include "plugin/pluginloaderimpl.h"
 #include "plugin/pluginmanagerimpl.h"
-#include "util/log.h"
-#include "util/logdistributor.h"
 #include "util/streamlogsink.h"
 #include "util/support.h"
@@ -39 +37 @@
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
-
-static LicqDaemon::Daemon singleGlobalDaemonInstance;
 
 Licq::Daemon* Licq::Daemon::getInstance()
 {
-  return &singleGlobalDaemonInstance;
+  return LicqDaemon::Daemon::getInstance();
 }
 
 LicqDaemon::Daemon* LicqDaemon::Daemon::getInstance()
 {
-  return &singleGlobalDaemonInstance;
+  static LicqDaemon::Daemon daemon;
+  return &daemon;
 }
 
@@ -93 +89 @@
 
 LicqDaemon::Daemon::Daemon()
-  : myLog("daemon", &myLogDistributor)
-{
-  myStreamLogSink = new StreamLogSink(std::cerr);
-  myLogDistributor.registerSink(myStreamLogSink);
-
+  : myLog(*Log::getThreadLog())
+{
   myPluginLoader = new PluginLoaderImpl();
   myPluginCache = new PluginCacheImpl(myLog, *myPluginLoader);
@@ -108 +101 @@
   delete myPluginCache;
   delete myPluginLoader;
-
-  myLogDistributor.unregisterSink(myStreamLogSink);
-  delete myStreamLogSink;
-}
-
-void LicqDaemon::Daemon::setupLocalization()
-{
 }
 
@@ -121 +107 @@
 }
 
-bool LicqDaemon::Daemon::init(int argc, char** argv)
+bool LicqDaemon::Daemon::init(int argc, char** argv, StreamLogSink& streamLogSink)
 {
   namespace po = boost::program_options;
@@ -167 +153 @@
   }
 
-  if (vm.count("nocolors") || !isatty(STDERR_FILENO))
-    myStreamLogSink->setUseColors(false);
+  if (vm.count("nocolors"))
+    streamLogSink.setUseColors(false);
 
   {
@@ -199 +185 @@
          it != plugins.end(); ++it)
     {
+      /*
       Licq::Plugin::Id
           id = myPluginManager->loadPlugin(*it, myLogDistributor, 0, NULL);
       myLog.debug(tr("Loaded plugin %1% with id %2%") % *it % id);
+      */
     }
   }

branches/newapi/licq/src/daemon.h

@@ -23 +23 @@
 #include "licq/interface/daemon.h"
 #include "util/log.h"
-#include "util/logdistributor.h"
 
 #include <iosfwd>
@@ -31 +30 @@
 namespace LicqDaemon
 {
+
+class StreamLogSink;
 
 class Daemon : public Licq::Daemon
@@ -40 +41 @@
   ~Daemon();
 
-  void setupLocalization();
   void installSignalHandlers();
 
-  bool init(int argc, char** argv);
+  bool init(int argc, char** argv, StreamLogSink& streamLogSink);
   int main();
 
@@ -52 +52 @@
 
 private:
-  LogDistributor myLogDistributor;
-  Log myLog;
-
-  class StreamLogSink* myStreamLogSink;
+  Log& myLog;
 
   class PluginLoader* myPluginLoader;

branches/newapi/licq/src/main.cpp

@@ -10 +10 @@
 #include "licq/exception/exception.h"
 #include "licq/exception/invalidargumentexception.h"
+#include "util/log.h"
+#include "util/logdistributor.h"
 #include "util/tr.h"
+#include "util/streamlogsink.h"
 
 #include <iostream>
+#include <unistd.h>
 
 /*
@@ -51 +55 @@
 int main(int argc, char** argv)
 {
+  LicqDaemon::LogDistributor logDistributor;
+  LicqDaemon::Log::setThreadLog(new LicqDaemon::Log("licq", &logDistributor));
+  Licq::Log& log = *LicqDaemon::Log::getThreadLog();
+
+  // Enable logging to stderr
+  LicqDaemon::StreamLogSink streamLogSink(std::cerr);
+  logDistributor.registerSink(&streamLogSink);
+  if (!isatty(STDERR_FILENO))
+    streamLogSink.setUseColors(false);
+
+  // Fail if argv[0] isn't set
   if (argc < 1)
   {
-    std::cerr << "Licq requires at least one argument\n";
+    log.fatal() << tr("Licq requires argv[0] to be set");
     exit(EXIT_FAILURE);
   }
 
+  int retval = 0;
   try
   {
@@ -66 +82 @@
     try
     {
-      if (!daemon->init(argc, argv))
+      if (!daemon->init(argc, argv, streamLogSink))
         exit(EXIT_SUCCESS);
     }
@@ -72 +88 @@
     {
       std::cerr << ex << "\n";
-      std::cerr << "Try `" << argv[0] << " --help' for more information.\n";
+      std::cerr << tr("Try `%1% --help' for more information.") % argv[0] << "\n";
       exit(EXIT_FAILURE);
     }
 
-    int ret = daemon->main();
-    return ret;
+    retval = daemon->main();
   }
   catch (const Licq::Exception& ex)
   {
-    std::cerr << ex << "\n";
+    log.fatal() << ex;
     exit(EXIT_FAILURE);
   }
   catch (const std::exception& ex)
   {
-    std::cerr << "Caught std::exception: " << ex.what() << "\n";
+    log.fatal() << tr("Caught std::exception: %1%") % ex.what();
     exit(EXIT_FAILURE);
   }
   catch (...)
   {
-    std::cerr << "Caught unknown exception\n";
+    log.fatal() << tr("Caught unknown exception");
     exit(EXIT_FAILURE);
   }
-  return 0;
+
+  if (retval != 0)
+    log.error(tr("Licq finished with exit code %1%") % retval);
+
+  logDistributor.unregisterSink(&streamLogSink);
+  return retval;
 
   /*