#include <iostream>
#ifdef HAVE_SYSLOG
-# include <syslog.h>
+# include <syslog.h>
#endif
#include <QByteArray>
namespace {
-QByteArray msgWithTime(const Logger::LogEntry &msg)
+QByteArray msgWithTime(const Logger::LogEntry& msg)
{
return (msg.timeStamp.toString("yyyy-MM-dd hh:mm:ss ") + msg.message + "\n").toUtf8();
}
-}
-
+} // namespace
-Logger::Logger(QObject *parent)
+Logger::Logger(QObject* parent)
: QObject(parent)
{
static bool registered = []() {
}();
Q_UNUSED(registered)
- connect(this, SIGNAL(messageLogged(Logger::LogEntry)), this, SLOT(onMessageLogged(Logger::LogEntry)));
+ connect(this, &Logger::messageLogged, this, &Logger::onMessageLogged);
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) {
+ for (auto&& message : _messages) {
std::cerr << msgWithTime(message).constData();
}
}
}
-
std::vector<Logger::LogEntry> Logger::messages() const
{
return _messages;
}
-
void Logger::setup(bool keepMessages)
{
_keepMessages = keepMessages;
QString logfilename = Quassel::optionValue("logfile");
if (!logfilename.isEmpty()) {
_logFile.setFileName(logfilename);
- if (!_logFile.open(QFile::Append|QFile::Unbuffered|QFile::Text)) {
+ 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)) {
+ if (!_logFile.open(stderr, QFile::WriteOnly | QFile::Unbuffered | QFile::Text)) {
qCritical() << qPrintable(tr("Cannot write to stderr: %1").arg(_logFile.errorString()));
}
}
_initialized = true;
// Now that we've setup our logging backends, output pending messages
- for (auto &&message : _messages) {
+ for (auto&& message : _messages) {
outputMessage(message);
}
if (!_keepMessages) {
}
}
-
-void Logger::messageHandler(QtMsgType type, const QMessageLogContext &, const QString &message)
+void Logger::messageHandler(QtMsgType type, const QMessageLogContext&, const QString& message)
{
Quassel::instance()->logger()->handleMessage(type, message);
}
-
-void Logger::handleMessage(QtMsgType type, const QString &msg)
+void Logger::handleMessage(QtMsgType type, const QString& msg)
{
switch (type) {
case QtDebugMsg:
}
}
-
-void Logger::handleMessage(LogLevel level, const QString &msg)
+void Logger::handleMessage(LogLevel level, const QString& msg)
{
QString logString;
emit messageLogged({QDateTime::currentDateTime(), level, logString += msg});
}
-
-void Logger::onMessageLogged(const LogEntry &message)
+void Logger::onMessageLogged(const LogEntry& message)
{
if (_keepMessages) {
_messages.push_back(message);
}
}
-
-void Logger::outputMessage(const LogEntry &message)
+void Logger::outputMessage(const LogEntry& message)
{
if (message.logLevel < _outputLevel) {
return;
case LogLevel::Fatal:
prio = LOG_CRIT;
}
- syslog(prio|LOG_USER, "%s", qPrintable(message.message));
+ syslog(prio | LOG_USER, "%s", qPrintable(message.message));
}
#endif
}
}
#endif
-
}