From a949a113cfa373cc70bdffca793fa93e4d6d626f Mon Sep 17 00:00:00 2001
From: Xavier Michelon <xavier.michelon@proton.ch>
Date: Fri, 4 Nov 2022 09:35:07 +0100
Subject: [PATCH] Other: added timestamp to bridge-gui logs.

Changed format to be closer to logrus output.
---
 .../bridge-gui/bridgepp/bridgepp/Log/Log.cpp         | 12 +++++++-----
 .../frontend/bridge-gui/bridgepp/bridgepp/Log/Log.h  |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.cpp
index e7b8d617..538aa976 100644
--- a/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.cpp
+++ b/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.cpp
@@ -30,7 +30,7 @@ namespace
 Log *qtHandlerLog { nullptr }; ///< The log instance handling qt logs.
 QMutex qtHandlerMutex; ///< A mutex used to access qtHandlerLog.
 
-// Mapping of log levels to string. Maybe used to lookup using both side a a key, so a list of pair is more convenient that a map.
+// Mapping of log levels to string. Maybe used to lookup using both side a key, so a list of pair is more convenient that a map.
 QList<QPair<Log::Level, QString>> const logLevelStrings {
     { Log::Level::Panic, "panic", },
     { Log::Level::Fatal, "fatal", },
@@ -96,15 +96,15 @@ void qtMessageHandler(QtMsgType type, QMessageLogContext const &, QString const
 
 
 //****************************************************************************************************************************************************
-/// \brief return a string representing the log entry
+/// \brief return a string representing the log entry, in a format similar to the one used by logrus.
 ///
 /// \param[in] level The log entry level.
 /// \param[in] message The log entry message.
 /// \return The string for the log entry
 //****************************************************************************************************************************************************
-QString Log::logEntryToString(Log::Level level, QString const &message)
+QString Log::logEntryToString(Log::Level level, QDateTime const &dateTime, QString const &message)
 {
-    return QString("[%1] %2").arg(levelToString(level).toUpper(), message);
+    return QString("%1[%2] %3").arg(levelToString(level).left(4).toUpper(), dateTime.toString("MMM dd HH:mm:ss.zzz"), message);
 }
 
 
@@ -303,15 +303,17 @@ void Log::trace(QString const &message)
 //****************************************************************************************************************************************************
 void Log::addEntry(Log::Level level, QString const &message)
 {
+    QDateTime const dateTime = QDateTime::currentDateTime();
     QMutexLocker locker(&mutex_);
     if (qint32(level) > qint32(level_))
         return;
+
     emit entryAdded(level, message);
 
     if (!(echoInConsole_ || file_))
         return;
 
-    QString const entryStr = logEntryToString(level, message) + "\n";
+    QString const entryStr = logEntryToString(level, dateTime, message) + "\n";
     if (echoInConsole_)
     {
         QTextStream &stream = (qint32(level) <= (qint32(Level::Warn))) ? stderr_ : stdout_;
diff --git a/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.h
index c21d8420..a5beb2c9 100644
--- a/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.h
+++ b/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.h
@@ -44,7 +44,7 @@ public: // data types.
     };
 
 public: // static member functions.
-    static QString logEntryToString(Log::Level level, QString const &message); ///< Return a string describing a log entry.
+    static QString logEntryToString(Log::Level level, QDateTime const &dateTime, QString const &message); ///< Return a string describing a log entry.
     static QString levelToString(Log::Level level); ///< return the string for a level.
     static bool stringToLevel(QString const &str, Log::Level& outLevel); ///< parse a level from a string.