X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;h=59efa6b6d1b2741c0269ca11b8b832c3102e3b4c;hp=de20651835f384c90a3a703637c9ff68cf8fc672;hb=c9b7f5cfe4377cc242c24212fff48aad70192b48;hpb=f18d7db990cb23c87fa3586e19b2f8aa5509a66c

diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index de206518..59efa6b6 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -19,32 +19,42 @@
  ***************************************************************************/
 
 #include "logger.h"
+#include "global.h"
 
-#include <iostream>
-
-
+#include <QFile>
+#include <QTextStream>
+#include <QDateTime>
 
 Logger::~Logger() {
-  qInstallMsgHandler(0);
+  QDateTime date = QDateTime::currentDateTime();
+  if(_logLevel == DebugLevel) _buffer.prepend("Debug: ");
+  else if (_logLevel == InfoLevel) _buffer.prepend("Info: ");
+  else if (_logLevel == WarningLevel) _buffer.prepend("Warning: ");
+  else if (_logLevel == ErrorLevel) _buffer.prepend("Error: ");
+  _buffer.prepend(date.toString("yyyy-MM-dd hh:mm:ss "));
+  log();
 }
 
-void messageHandler(QtMsgType type, const char *msg) {
-  switch (type) {
-    case QtDebugMsg:
-      std::cerr << "[DEBUG] " << msg << "\n";
-      break;
-    case QtWarningMsg:
-      std::cerr << "[WARNING] " << msg << "\n";
-      break;
-    case QtCriticalMsg:
-      std::cerr << "[CRITICAL] " << msg << "\n";
-      break;
-    case QtFatalMsg:
-      std::cerr << "[FATAL] " << msg << "\n";
-      abort(); // deliberately core dump
-  }
-}
+void Logger::log() {
+  LogLevel lvl;
+  if (Global::parser.value("loglevel") == "Debug") lvl = DebugLevel;
+  else if (Global::parser.value("loglevel") == "Info") lvl = InfoLevel;
+  else if (Global::parser.value("loglevel") == "Warning") lvl = WarningLevel;
+  else if (Global::parser.value("loglevel") == "Error") lvl = ErrorLevel;
+  else lvl = InfoLevel;
+
+  if(_logLevel < lvl) return;
 
-Logger::Logger() {
-  qInstallMsgHandler(messageHandler);
+  // if we can't open logfile we log to stdout
+  QTextStream out(stdout);
+  QFile file;
+  if(!Global::parser.value("logfile").isEmpty()) {
+    file.setFileName(Global::parser.value("logfile"));
+    if (file.open(QIODevice::Append | QIODevice::Text)) {
+      out.setDevice(&file);
+      _buffer.remove(QChar('\n'));
+    }
+  }
+  out << _buffer << endl;
+  if(file.isOpen()) file.close();
 }