X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;h=59efa6b6d1b2741c0269ca11b8b832c3102e3b4c;hp=5d7c64a3f285e7409865160fe12e92fbebec8c7a;hb=a1d785ae12b3ec04b43e243f3397bb6f8ecf60d5;hpb=6b75ac568098c17de5f0a98ce0d96781b86e98b3 diff --git a/src/common/logger.cpp b/src/common/logger.cpp index 5d7c64a3..59efa6b6 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -27,13 +27,12 @@ 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 ")); + 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(); - delete stream; } void Logger::log() { @@ -44,7 +43,7 @@ void Logger::log() { else if (Global::parser.value("loglevel") == "Error") lvl = ErrorLevel; else lvl = InfoLevel; - if(stream->logLevel < lvl) return; + if(_logLevel < lvl) return; // if we can't open logfile we log to stdout QTextStream out(stdout); @@ -53,9 +52,9 @@ void Logger::log() { file.setFileName(Global::parser.value("logfile")); if (file.open(QIODevice::Append | QIODevice::Text)) { out.setDevice(&file); - stream->buffer.remove(QChar('\n')); + _buffer.remove(QChar('\n')); } } - out << stream->buffer << "\n"; + out << _buffer << endl; if(file.isOpen()) file.close(); }