X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;h=78a3610c82b2116f331f1c29e79e824e9fd1c9e3;hp=5d7c64a3f285e7409865160fe12e92fbebec8c7a;hb=245a92b091b754bfdb8a5d6bd4da470ead5aaa29;hpb=6b75ac568098c17de5f0a98ce0d96781b86e98b3

diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index 5d7c64a3..78a3610c 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,44 +18,97 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "logger.h"
-#include "global.h"
-
 #include <QFile>
 #include <QTextStream>
 #include <QDateTime>
 
+#ifdef HAVE_SYSLOG
+#  include <syslog.h>
+#endif
+
+#include "logger.h"
+#include "quassel.h"
+
 Logger::~Logger() {
-  QDateTime date = QDateTime::currentDateTime();
-  if(stream->logLevel == DebugLevel) stream->buffer.prepend("Debug: ");
-  else if (stream->logLevel == InfoLevel) stream->buffer.prepend("Info: ");
-  else if (stream->logLevel == WarningLevel) stream->buffer.prepend("Warning: ");
-  else if (stream->logLevel == ErrorLevel) stream->buffer.prepend("Error: ");
-  stream->buffer.prepend(date.toString("yyyy-MM-dd hh:mm:ss "));
   log();
-  delete stream;
 }
 
 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 < Quassel::logLevel())
+    return;
 
-  if(stream->logLevel < lvl) 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;
+  }
 
-  // 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);
-      stream->buffer.remove(QChar('\n'));
+#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 Quassel::ErrorLevel:
+      prio = LOG_ERR;
+      break;
+    default:
+      prio = LOG_INFO;
+      break;
     }
+    syslog(LOG_USER & prio, "%s", qPrintable(_buffer));
+  }
+  // don't log to stdout if --syslog was specified (but neither ignore --logfile)
+  if(!Quassel::logFile())
+    return;
+#endif
+
+  _buffer.prepend(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss "));
+
+  // if we don't have a logfile we log to stdout
+
+  QTextStream out(stdout);
+  if(Quassel::logFile() && Quassel::logFile()->isOpen()) {
+    _buffer.remove(QChar('\n'));
+    out.setDevice(Quassel::logFile());
+  }
+
+  out << _buffer << endl;
+}
+
+
+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;
   }
-  out << stream->buffer << "\n";
-  if(file.isOpen()) file.close();
 }