[connectionagent] remove logger class and use QMessageHandler for

debug output.
sailfishos · Oct 3, 2013 · e6c29c4 · e6c29c4
1 parent 915cdf0
commit e6c29c4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 76 deletions.
diff --git a/connd/connd.pro b/connd/connd.pro
@@ -26,14 +26,11 @@ OTHER_FILES += com.jolla.Connectiond.xml
 
 SOURCES += main.cpp \
     qconnectionmanager.cpp \
-    connadaptor.cpp \
-    logger.cpp
-
+    connadaptor.cpp
 
 HEADERS+= \
     qconnectionmanager.h \
-    connadaptor.h \
-    logger.h
+    connadaptor.h
 
 target.path = /usr/bin
 INSTALLS += target

diff --git a/connd/logger.cpp b/connd/logger.cpp
diff --git a/connd/logger.h b/connd/logger.h
diff --git a/connd/main.cpp b/connd/main.cpp
@@ -26,7 +26,6 @@
 
 #include "qconnectionmanager.h"
 #include "connadaptor.h"
-#include "logger.h"
 
 static void signal_handler(int signum)
 {
@@ -77,37 +76,25 @@ static void daemonize(void)
 
     umask(027);
 }
-Q_GLOBAL_STATIC(Logger, loggerStatic)
 
+static QtMessageHandler previousMessageHandler;
+bool toggleDebug;
 
-void messageOutput(QtMsgType type, const QMessageLogContext &, const QString &str)
+void messageOutput(QtMsgType type, const QMessageLogContext &context, const QString &str)
  {
-    const char * msg = str.toStdString().c_str();
-     switch (type) {
-     case QtDebugMsg:
-         loggerStatic()->logDebug(msg);
-         break;
-     case QtWarningMsg:
-         loggerStatic()->logWarning(msg);
-         break;
-     case QtCriticalMsg:
-         loggerStatic()->logCritical(msg);
-         break;
-     case QtFatalMsg:
-         fprintf(stderr, "%s\n", msg);
-         abort();
-     }
+    if (toggleDebug)
+        previousMessageHandler(type,context,str);
  }
 
 int main(int argc, char *argv[])
 {
-    qInstallMessageHandler(messageOutput);
+    previousMessageHandler = qInstallMessageHandler(messageOutput);
 
     if (argc > 1) {
         if (strcmp(argv[1],"-n") == 0) { //nodaemon
             daemonize();
         } else if (strcmp(argv[1],"-d") == 0) { //debug
-            loggerStatic->toggleDebug(true);
+            toggleDebug = true;
         }
     }
     QCoreApplication::setOrganizationName("Jolla");