Index: sources/storage/Logger.h =================================================================== diff -u -r84c5373209a1a488c00917995f5553d442d159a4 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/storage/Logger.h (.../Logger.h) (revision 84c5373209a1a488c00917995f5553d442d159a4) +++ sources/storage/Logger.h (.../Logger.h) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -7,9 +7,9 @@ * * \file Logger.h * \author (last) Behrouz NematiPour - * \date (last) 20-Aug-2020 + * \date (last) 12-Sep-2020 * \author (original) Behrouz NematiPour - * \date (original) 24-Sep-2019 + * \date (original) 26-Aug-2020 * */ #pragma once @@ -23,13 +23,11 @@ #include "main.h" // Doxygen : don't remove #include "StorageGlobals.h" - // Define #define _Logger Storage::Logger::I() #define LOG_EXPORT _Logger.concurrentExportLogs() - #define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug) #define LOG_EVENT(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogEvent) @@ -124,17 +122,21 @@ const char *_dateFormat = "yyyy_MM_dd"; const char *_timeFormat = "HH:mm:ss"; - const char *_dateSeparator = "_"; // used in filename + const char *_dateSeparator = "_"; // used in filename const char *_separator = ","; - QString _logFileName = ""; + bool _enableConsoleOut = false; + QString _logFileName = ""; + QFutureWatcher _exportLogsWatcher; QFutureWatcher _removeLogsWatcher; QThread *_thread = nullptr; bool _init = false; +public: + void enableConsoleOut(bool vEnabled); public slots: bool init(); @@ -178,7 +180,6 @@ private slots: void onSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent); - // ----- logging structure private slots: void onLog (const QString &vContent, LogType vLogType);