X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Flogger.h;h=f55590c1c696efc1538f5846f5f1440050ac1693;hb=fad08c0bc53514b43fdf44e5a792a019b1414367;hp=d9b51a63a44d9fede89534c7551c4cd2ed214567;hpb=034708a59ca1ee3195263a90941a2b145c520fef;p=quassel.git

diff --git a/src/common/logger.h b/src/common/logger.h
index d9b51a63..f55590c1 100644
--- a/src/common/logger.h
+++ b/src/common/logger.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005 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  *
@@ -15,47 +15,110 @@
  *   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.         *
  ***************************************************************************/
 
-#ifndef LOGGER_H
-#define LOGGER_H
+#pragma once
 
-#include "types.h"
+#include "common-export.h"
 
+#include <vector>
+
+#include <QDateTime>
+#include <QFile>
+#include <QMetaType>
+#include <QObject>
 #include <QString>
-#include <QStringList>
-#include <QTextStream>
 
-class Logger {
+/**
+ * The Logger class encapsulates the various configured logging backends.
+ */
+class COMMON_EXPORT Logger : public QObject
+{
+    Q_OBJECT
+
 public:
-  enum LogLevel {
-    DebugLevel,
-    InfoLevel,
-    WarningLevel,
-    ErrorLevel
-  };
+    Logger(QObject* parent = nullptr);
+    ~Logger() override;
+
+    enum class LogLevel
+    {
+        Debug,
+        Info,
+        Warning,
+        Error,
+        Fatal
+    };
+
+    struct COMMON_EXPORT LogEntry
+    {
+        QDateTime timeStamp;
+        LogLevel logLevel;
+        QString message;
+
+        /**
+         * Gets this log entry in a printable format, with timestamp and log level
+         *
+         * @return the log entry, formatted with timestamp and log level
+         */
+        QString toString() const;
+    };
+
+    /**
+     * Initial setup, to be called ones command line options are available.
+     *
+     * Sets up the log file if appropriate. Outputs the log messages already accumulated since
+     * construction. If @c keepMessages is false, deletes the accumulated messages afterwards,
+     * and won't store further ones.
+     *
+     * @param keepMessages Whether messages should be kept
+     * @throws ExitException, if command line options are invalid
+     */
+    void setup(bool keepMessages);
 
-  inline Logger(LogLevel level) : _stream(&_buffer, QIODevice::WriteOnly), _logLevel(level) {}
-  ~Logger();
+    /**
+     * Accesses the stores log messages, e.g. for consumption by DebugLogWidget.
+     *
+     * @returns The accumuates log messages
+     */
+    std::vector<Logger::LogEntry> messages() const;
 
-  static void logMessage(QtMsgType type, const char *msg);
+    static void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message);
 
-  template<typename T>
-  inline Logger &operator<<(const T &value) { _stream << value << " "; return *this; }
-  inline Logger &operator<<(const QStringList & t) { _stream << t.join(" ") << " "; return *this; }
-  inline Logger &operator<<(bool t) { _stream << (t ? "true" : "false") << " "; return *this; }
+    /**
+     * Takes the given message with the given log level, formats it and emits the @a messageLogged() signal.
+     *
+     * @note This method is thread-safe.
+     *
+     * @param logLevel The log leve of the message
+     * @param message  The message
+     */
+    void handleMessage(LogLevel logLevel, const QString& message);
+
+signals:
+    /**
+     * Emitted whenever a message was logged.
+     *
+     * @param message The message that was logged
+     */
+    void messageLogged(const Logger::LogEntry& message);
+
+private slots:
+    void onMessageLogged(const Logger::LogEntry& message);
 
 private:
-  void log();
-  QTextStream _stream;
-  QString _buffer;
-  LogLevel _logLevel;
-};
+    void handleMessage(QtMsgType type, const QString& message);
+    void outputMessage(const LogEntry& message);
 
-class quInfo : public Logger {
-public:
-  inline quInfo() : Logger(Logger::InfoLevel) {}
+private:
+    LogLevel _outputLevel{LogLevel::Info};
+    QFile _logFile;
+    bool _syslogEnabled{false};
+
+    std::vector<LogEntry> _messages;
+    bool _keepMessages{true};
+    bool _initialized{false};
+    QByteArray _prgname;
 };
 
-#endif
+Q_DECLARE_METATYPE(Logger::LogEntry)