X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;h=d17e18226c40694850be7ac4de79a3af3a91053d;hp=c9495a546c80c7e39ea112aaff6358dba5bfe668;hb=c18e611a6b8c07049cc82b2dcdb5b138d9a6dd43;hpb=dd711790dddee81442e2138b3917764dac39c487 diff --git a/src/common/logger.cpp b/src/common/logger.cpp index c9495a54..d17e1822 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,128 +18,229 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include -#include +#include #ifdef HAVE_SYSLOG -# include +# include #endif +#include +#include +#include +#include + #include "logger.h" #include "quassel.h" +#include "types.h" -Logger::~Logger() -{ - log(); -} - +namespace { -void Logger::log() +QByteArray msgWithTime(const Logger::LogEntry& msg) { - 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; - } + QString levelString; -#ifdef HAVE_SYSLOG - if (Quassel::logToSyslog()) { - int prio; - switch (_logLevel) { - case Quassel::DebugLevel: - prio = LOG_DEBUG; + switch (msg.logLevel) { + case Logger::LogLevel::Debug: + levelString = "[Debug] "; break; - case Quassel::InfoLevel: - prio = LOG_INFO; + case Logger::LogLevel::Info: + levelString = "[Info ] "; break; - case Quassel::WarningLevel: - prio = LOG_WARNING; + case Logger::LogLevel::Warning: + levelString = "[Warn ] "; break; - case Quassel::ErrorLevel: - prio = LOG_ERR; + case Logger::LogLevel::Error: + levelString = "[Error] "; break; - default: - prio = LOG_INFO; + case Logger::LogLevel::Fatal: + levelString = "[FATAL] "; break; - } - syslog(prio|LOG_USER, "%s", qPrintable(_buffer)); } -#endif - // if we neither use syslog nor have a logfile we log to stdout + return (msg.timeStamp.toString("yyyy-MM-dd hh:mm:ss ") + levelString + msg.message + "\n").toUtf8(); +} + +} // namespace - if (Quassel::logFile() || !Quassel::logToSyslog()) { - _buffer.prepend(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss ")); +Logger::Logger(QObject* parent) + : QObject(parent) +{ + static bool registered = []() { + qRegisterMetaType(); + return true; + }(); + Q_UNUSED(registered) - QTextStream out(stdout); - if (Quassel::logFile() && Quassel::logFile()->isOpen()) { - _buffer.remove(QChar('\n')); - out.setDevice(Quassel::logFile()); - } + connect(this, &Logger::messageLogged, this, &Logger::onMessageLogged); - out << _buffer << endl; + 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(); + } } } +std::vector Logger::messages() const +{ + return _messages; +} -#if QT_VERSION < 0x050000 -void Logger::logMessage(QtMsgType type, const char *msg) +void Logger::setup(bool keepMessages) { - 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; + _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"); + + Quassel::RunMode mode = Quassel::runMode(); + Quassel::BuildInfo info = Quassel::buildInfo(); + QString prgname = info.applicationName; + + if (mode == Quassel::RunMode::ClientOnly) { + prgname = info.clientApplicationName; + } else if (mode == Quassel::RunMode::CoreOnly) { + prgname = info.coreApplicationName; + } + + _prgname = prgname.toLocal8Bit(); + + // set up options, program name, and facility for later calls to syslog(3) + if (_syslogEnabled) { + openlog(_prgname.constData(), LOG_PID, LOG_USER); + } +#endif + + _initialized = true; + + // Now that we've setup our logging backends, output pending messages + for (auto&& message : _messages) { + outputMessage(message); + } + if (!_keepMessages) { + _messages.clear(); } } -#else -void Logger::logMessage(QtMsgType type, const QMessageLogContext &context, const QString &msg) + +void Logger::messageHandler(QtMsgType type, const QMessageLogContext&, const QString& message) { - Q_UNUSED(context) + Quassel::instance()->logger()->handleMessage(type, message); +} +void Logger::handleMessage(QtMsgType type, const QString& msg) +{ switch (type) { case QtDebugMsg: - Logger(Quassel::DebugLevel) << msg.toLocal8Bit().constData(); + handleMessage(LogLevel::Debug, msg); break; -#if QT_VERSION >= 0x050500 case QtInfoMsg: - Logger(Quassel::InfoLevel) << msg.toLocal8Bit().constData(); + handleMessage(LogLevel::Info, msg); break; -#endif case QtWarningMsg: - Logger(Quassel::WarningLevel) << msg.toLocal8Bit().constData(); + handleMessage(LogLevel::Warning, msg); break; case QtCriticalMsg: - Logger(Quassel::ErrorLevel) << msg.toLocal8Bit().constData(); + handleMessage(LogLevel::Error, msg); break; case QtFatalMsg: - Logger(Quassel::ErrorLevel) << msg.toLocal8Bit().constData(); - Quassel::logFatalMessage(msg.toLocal8Bit().constData()); - return; + handleMessage(LogLevel::Fatal, msg); + break; } } + +void Logger::handleMessage(LogLevel level, const QString& msg) +{ + // Use signal connection to make this method thread-safe + emit messageLogged({QDateTime::currentDateTime(), level, msg}); +} + +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::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, "%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 +}