X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;h=c767fc65d2712147519ea5b9cd908194c7c13a0f;hp=d9708f780923a79fc3e9d10505ec758165dfa6dd;hb=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc;hpb=98bec7bab038a8e656f90617c59fe1e8c0907f71 diff --git a/src/common/logger.cpp b/src/common/logger.cpp index d9708f78..c767fc65 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,97 +15,225 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include -#include +#include #ifdef HAVE_SYSLOG # include #endif +#include +#include +#include +#include + #include "logger.h" #include "quassel.h" +#include "types.h" + +namespace { -Logger::~Logger() { - log(); +QByteArray msgWithTime(const Logger::LogEntry &msg) +{ + return (msg.timeStamp.toString("yyyy-MM-dd hh:mm:ss ") + msg.message + "\n").toUtf8(); } -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 Quassel::ErrorLevel: - prio = LOG_ERR; - break; - default: - prio = LOG_INFO; - break; + +Logger::Logger(QObject *parent) + : QObject(parent) +{ + static bool registered = []() { + qRegisterMetaType(); + return true; + }(); + Q_UNUSED(registered) + + connect(this, SIGNAL(messageLogged(Logger::LogEntry)), this, SLOT(onMessageLogged(Logger::LogEntry))); + + qInstallMessageHandler(Logger::messageHandler); +} + + +Logger::~Logger() +{ + // If we're not initialized yet, output pending messages so they don't get lost + if (!_initialized) { + for (auto &&message : _messages) { + std::cerr << msgWithTime(message).constData(); + } } - syslog(LOG_USER & prio, "%s", qPrintable(_buffer)); - } +} + + +std::vector Logger::messages() const +{ + return _messages; +} + + +void Logger::setup(bool keepMessages) +{ + _keepMessages = keepMessages; + + // Set maximum level for output (we still store/announce all messages for client-side filtering) + if (Quassel::isOptionSet("loglevel")) { + QString level = Quassel::optionValue("loglevel").toLower(); + if (level == "debug") + _outputLevel = LogLevel::Debug; + else if (level == "info") + _outputLevel = LogLevel::Info; + else if (level == "warning") + _outputLevel = LogLevel::Warning; + else if (level == "error") + _outputLevel = LogLevel::Error; + else { + throw ExitException{EXIT_FAILURE, qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level))}; + } + } + + QString logfilename = Quassel::optionValue("logfile"); + if (!logfilename.isEmpty()) { + _logFile.setFileName(logfilename); + if (!_logFile.open(QFile::Append|QFile::Unbuffered|QFile::Text)) { + qCritical() << qPrintable(tr("Could not open log file \"%1\": %2").arg(logfilename, _logFile.errorString())); + } + } + if (!_logFile.isOpen()) { + if (!_logFile.open(stderr, QFile::WriteOnly|QFile::Unbuffered|QFile::Text)) { + qCritical() << qPrintable(tr("Cannot write to stderr: %1").arg(_logFile.errorString())); + } + } + +#ifdef HAVE_SYSLOG + _syslogEnabled = Quassel::isOptionSet("syslog"); #endif - _buffer.prepend(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss ")); + _initialized = true; - // if we don't have a logfile we log to stdout + // Now that we've setup our logging backends, output pending messages + for (auto &&message : _messages) { + outputMessage(message); + } + if (!_keepMessages) { + _messages.clear(); + } +} + + +void Logger::messageHandler(QtMsgType type, const QMessageLogContext &, const QString &message) +{ + Quassel::instance()->logger()->handleMessage(type, message); +} + + +void Logger::handleMessage(QtMsgType type, const QString &msg) +{ + switch (type) { + case QtDebugMsg: + handleMessage(LogLevel::Debug, msg); + break; + case QtInfoMsg: + handleMessage(LogLevel::Info, msg); + break; + case QtWarningMsg: + handleMessage(LogLevel::Warning, msg); + break; + case QtCriticalMsg: + handleMessage(LogLevel::Error, msg); + break; + case QtFatalMsg: + handleMessage(LogLevel::Fatal, msg); + break; + } +} + + +void Logger::handleMessage(LogLevel level, const QString &msg) +{ + QString logString; + + switch (level) { + case LogLevel::Debug: + logString = "[Debug] "; + break; + case LogLevel::Info: + logString = "[Info ] "; + break; + case LogLevel::Warning: + logString = "[Warn ] "; + break; + case LogLevel::Error: + logString = "[Error] "; + break; + case LogLevel::Fatal: + logString = "[FATAL] "; + break; + } + + // Use signal connection to make this method thread-safe + emit messageLogged({QDateTime::currentDateTime(), level, logString += msg}); +} - QTextStream out(stdout); - if(Quassel::logFile() && Quassel::logFile()->isOpen()) { - _buffer.remove(QChar('\n')); - out.setDevice(Quassel::logFile()); - } - out << _buffer << endl; +void Logger::onMessageLogged(const LogEntry &message) +{ + if (_keepMessages) { + _messages.push_back(message); + } + + // If setup() wasn't called yet, just store the message - will be output later + if (_initialized) { + outputMessage(message); + } } -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; - } +void Logger::outputMessage(const LogEntry &message) +{ + if (message.logLevel < _outputLevel) { + return; + } + +#ifdef HAVE_SYSLOG + if (_syslogEnabled) { + int prio{LOG_INFO}; + switch (message.logLevel) { + case LogLevel::Debug: + prio = LOG_DEBUG; + break; + case LogLevel::Info: + prio = LOG_INFO; + break; + case LogLevel::Warning: + prio = LOG_WARNING; + break; + case LogLevel::Error: + prio = LOG_ERR; + break; + case LogLevel::Fatal: + prio = LOG_CRIT; + } + syslog(prio|LOG_USER, "%s", qPrintable(message.message)); + } +#endif + + if (!_logFile.fileName().isEmpty() || !_syslogEnabled) { + _logFile.write(msgWithTime(message)); + } + +#ifndef Q_OS_MAC + // For fatal messages, write log to dump file + if (message.logLevel == LogLevel::Fatal) { + QFile dumpFile{Quassel::instance()->coreDumpFileName()}; + if (dumpFile.open(QIODevice::Append)) { + dumpFile.write(msgWithTime(message)); + dumpFile.close(); + } + } +#endif + }