X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;h=bf270f9dbe356e487699bc3466368f7884d823d0;hp=26296bb7405f121aa1e75e0d7787ce63dbc2a4d6;hb=2b1fcb466b3694a900aab579d60d8e61456844f7;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index 26296bb7..bf270f9d 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005 by the Quassel Project                             *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,33 +18,96 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "logger.h"
-
-#include <iostream>
+#include <QFile>
+#include <QTextStream>
+#include <QDateTime>
 
+#ifdef HAVE_SYSLOG
+#  include <syslog.h>
+#endif
 
+#include "logger.h"
+#include "quassel.h"
 
 Logger::~Logger() {
-  //qInstallMsgHandler(0);
+  log();
 }
 
-void messageHandler(QtMsgType type, const char *msg) {
-  switch (type) {
-    case QtDebugMsg:
-      std::cerr << "[DEBUG] " << msg << "\n";
+void Logger::log() {
+  if(_logLevel < Quassel::logLevel())
+    return;
+
+  switch(_logLevel) {
+  case Quassel::DebugLevel:
+    _buffer.prepend("Debug: ");
+    break;
+  case Quassel::InfoLevel:
+    _buffer.prepend("Info: ");
+    break;
+    case Quassel::WarningLevel:
+    _buffer.prepend("Warning: ");
+    break;
+  case Quassel::ErrorLevel:
+    _buffer.prepend("Error: ");
+    break;
+  default:
+    break;
+  }
+
+#ifdef HAVE_SYSLOG
+  if(Quassel::logToSyslog()) {
+    int prio;
+    switch(_logLevel) {
+    case Quassel::DebugLevel:
+      prio = LOG_DEBUG;
+      break;
+    case Quassel::InfoLevel:
+      prio = LOG_INFO;
+      break;
+    case Quassel::WarningLevel:
+      prio = LOG_WARNING;
       break;
-    case QtWarningMsg:
-      std::cerr << "[WARNING] " << msg << "\n";
+    case Quassel::ErrorLevel:
+      prio = LOG_ERR;
       break;
-    case QtCriticalMsg:
-      std::cerr << "[CRITICAL] " << msg << "\n";
+    default:
+      prio = LOG_INFO;
       break;
-    case QtFatalMsg:
-      std::cerr << "[FATAL] " << msg << "\n";
-      abort(); // deliberately core dump
+    }
+    syslog(LOG_USER & prio, "%s", qPrintable(_buffer));
+  }
+#endif
+
+  // if we neither use syslog nor have a logfile we log to stdout
+
+  if(Quassel::logFile() || !Quassel::logToSyslog()) {
+    _buffer.prepend(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss "));
+
+    QTextStream out(stdout);
+    if(Quassel::logFile() && Quassel::logFile()->isOpen()) {
+      _buffer.remove(QChar('\n'));
+      out.setDevice(Quassel::logFile());
+    }
+
+    out << _buffer << endl;
   }
 }
 
-Logger::Logger() {
-  //qInstallMsgHandler(messageHandler);
+
+void Logger::logMessage(QtMsgType type, const char *msg) {
+  switch (type) {
+  case QtDebugMsg:
+    Logger(Quassel::DebugLevel) << msg;
+    break;
+  case QtWarningMsg:
+    Logger(Quassel::WarningLevel) << msg;
+    break;
+  case QtCriticalMsg:
+    Logger(Quassel::ErrorLevel) << msg;
+    break;
+  case QtFatalMsg:
+    Logger(Quassel::ErrorLevel) << msg;
+    Quassel::logFatalMessage(msg);
+    return;
+  }
 }