Index: sources/storage/Logger.h =================================================================== diff -u -rc97b99199d1be46f7cfa99908308ce98c8578285 -rc2ed4667b513c51c5ee31566c15d2cf5a042ed61 --- sources/storage/Logger.h (.../Logger.h) (revision c97b99199d1be46f7cfa99908308ce98c8578285) +++ sources/storage/Logger.h (.../Logger.h) (revision c2ed4667b513c51c5ee31566c15d2cf5a042ed61) @@ -86,9 +86,11 @@ eLogAppED, ///< Application Events and Data : Massages on the CANBus eLogDebug, ///< Application Error : Service logs - eLogTrtmt, ///< Treatment Log Files + eLogCloud, ///< CloudSync Log Files : CloudSync debug logs + eLogTrtmt, ///< Treatment Rep Files : Treatment Report files - eLogType_Count, + eLogType_Count , + eLogAll , }; Q_ENUM(LogType) @@ -104,19 +106,22 @@ const QHash _logBasePathNames { { LogType::eLogAppED, Storage::Log_Folder_Application}, { LogType::eLogDebug, Storage::Log_Folder_Service }, - { LogType::eLogTrtmt, Storage::Log_Folder_Treatment }, + { LogType::eLogCloud, Storage::Log_Folder_CloudSync }, + { LogType::eLogTrtmt, Storage::Txr_Folder_Treatment }, }; const QHash _logNames { // Will be used for the logging in the file { LogType::eLogAppED, "Log" }, { LogType::eLogDebug, "Service" }, + { LogType::eLogCloud, "Cloud" }, { LogType::eLogTrtmt, "Treatment" }, }; const QHash _logFileNameExt { { LogType::eLogAppED, ".log" }, // Application log { LogType::eLogDebug, ".err" }, // Application error - { LogType::eLogTrtmt, ".txr" }, // Treatment report + { LogType::eLogCloud, ".log" }, // CloudSync debug + { LogType::eLogTrtmt, ".txr" }, // Treatment report }; // !!!!!!!!!! IMPORTANT !!!!!!!!!! @@ -125,7 +130,8 @@ const QHash _logTypeMaxUsageLimit { { LogType::eLogAppED, Storage::Log_Max_Allowable_AppED_Space_Percent }, { LogType::eLogDebug, Storage::Log_Max_Allowable_Debug_Space_Percent }, - { LogType::eLogTrtmt, Storage::Log_Max_Allowable_Trtmt_Space_Percent }, + { LogType::eLogCloud, Storage::Log_Max_Allowable_Cloud_Space_Percent }, + { LogType::eLogTrtmt, Storage::Txr_Max_Allowable_Trtmt_Space_Percent }, }; const char *_dateFormat = "yyyy_MM_dd" ; // date used in the file name @@ -194,9 +200,9 @@ // ----- Remove Old Logs structure private: - int removeLogs(); + int removeLogs(LogType vLogType = eLogAll); private slots: // this slot is thread safe and can be called from outside but preferred not to. - bool concurrentRemoveLogs(); + bool concurrentRemoveLogs(LogType vLogType = eLogAll); void onRemoveLogs(); void onCryptSetupMount (bool vPass);