From d0badaa4e265a89ec4d9dbe96ef2339d04f433f3 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 10 May 2017 15:35:06 +0200 Subject: [PATCH] feat(src/app/logger/Logger): log thread --- linphone-desktop/src/app/logger/Logger.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/linphone-desktop/src/app/logger/Logger.cpp b/linphone-desktop/src/app/logger/Logger.cpp index d2086a6d2..9fa57d3ea 100644 --- a/linphone-desktop/src/app/logger/Logger.cpp +++ b/linphone-desktop/src/app/logger/Logger.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "../../Utils.hpp" #include "../paths/Paths.hpp" @@ -43,7 +44,7 @@ #define PURPLE "" #define RED "" #define RESET "" -#endif // ifdef __linux__ +#endif // if defined(__linux__) || defined(__APPLE__) #define QT_DOMAIN "qt" @@ -103,19 +104,19 @@ void Logger::log (QtMsgType type, const QMessageLogContext &context, const QStri BctbxLogLevel level; if (type == QtDebugMsg) { - format = GREEN "[%s][Debug]" PURPLE "%s" RESET "%s\n"; + format = GREEN "[%s][%p][Debug]" PURPLE "%s" RESET "%s\n"; level = BCTBX_LOG_DEBUG; } else if (type == QtInfoMsg) { - format = BLUE "[%s][Info]" PURPLE "%s" RESET "%s\n"; + format = BLUE "[%s][%p][Info]" PURPLE "%s" RESET "%s\n"; level = BCTBX_LOG_MESSAGE; } else if (type == QtWarningMsg) { - format = RED "[%s][Warning]" PURPLE "%s" RESET "%s\n"; + format = RED "[%s][%p][Warning]" PURPLE "%s" RESET "%s\n"; level = BCTBX_LOG_WARNING; } else if (type == QtCriticalMsg) { - format = RED "[%s][Critical]" PURPLE "%s" RESET "%s\n"; + format = RED "[%s][%p][Critical]" PURPLE "%s" RESET "%s\n"; level = BCTBX_LOG_ERROR; } else if (type == QtFatalMsg) { - format = RED "[%s][Fatal]" PURPLE "%s" RESET "%s\n"; + format = RED "[%s][%p][Fatal]" PURPLE "%s" RESET "%s\n"; level = BCTBX_LOG_FATAL; } else return; @@ -144,7 +145,7 @@ void Logger::log (QtMsgType type, const QMessageLogContext &context, const QStri mMutex.lock(); - fprintf(stderr, format, dateTime.constData(), context_str, localMsg.constData()); + fprintf(stderr, format, dateTime.constData(), QThread::currentThread(), context_str, localMsg.constData()); bctbx_log(QT_DOMAIN, level, "QT: %s%s", context_str, localMsg.constData()); mMutex.unlock();