Index: sources/storage/Logger.h =================================================================== diff -u -r142f2ddb8ce284c52c0add2acf3ac81f471b78de -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 --- sources/storage/Logger.h (.../Logger.h) (revision 142f2ddb8ce284c52c0add2acf3ac81f471b78de) +++ sources/storage/Logger.h (.../Logger.h) (revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file Logger.h * \author (last) Behrouz NematiPour - * \date (last) 28-Sep-2022 + * \date (last) 10-Feb-2023 * \author (original) Behrouz NematiPour * \date (original) 26-Aug-2020 * @@ -36,7 +36,7 @@ #define LOG_APPED(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogAppED, true ) #define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug, true ) -#define LOG_APPED_UI(vCONTENT) emit Storage::Logger::I().didLog("UI," + vCONTENT, Storage::Logger::LogType::eLogAppED, true ) +#define LOG_APPED_UI(vCONTENT) emit Storage::Logger::I().didLog(" ,UI," + vCONTENT, Storage::Logger::LogType::eLogAppED, true ) // forward declarations class tst_logging; @@ -94,7 +94,7 @@ bool _logStorageReady = true; - const char *_headerA = "TimeStamp,SubSys,Name,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40"; + const char *_headerA = "TimeStamp,ID,SubSys,Name,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40"; const char *_headerD = "TimeStamp,Description"; QDir _dir; QString _logFileNamePrefix; @@ -167,7 +167,7 @@ private: // ----- setting up void checkLogPath (); - void setLogBasePath (bool vUseApplicationDirPath = false); + void setLogBasePath (bool vUseTempPath = false); bool setLogPath (); bool setLogPath (LogType vLogType); public: @@ -195,6 +195,8 @@ private slots: // this slot is thread safe and can be called from outside but preferred not to. bool concurrentRemoveLogs(); void onRemoveLogs(); + void onCryptSetupMount (bool vPass); + signals: /*! * \brief didRemoveLogs