Index: sources/storage/logger.h =================================================================== diff -u -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/storage/logger.h (.../logger.h) (revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616) +++ sources/storage/logger.h (.../logger.h) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -28,36 +28,12 @@ #define LOG_EXPORT _Logger.concurrentExport() -#define LOG_EVENT(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogEvent) -#define LOG_EVENT_ONCE_LOGGED \ - bLOG_EVENT_ONCE_LOGGED -#define LOG_EVENT_ONCE(vCONTENT) \ - static bool LOG_EVENT_ONCE_LOGGED = false; \ - if ( ! LOG_EVENT_ONCE_LOGGED ) { \ - LOG_EVENT_ONCE_LOGGED = true; \ - LOG_EVENT(vCONTENT); \ - } -#define LOG_ERROR(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogError) -#define LOG_ERROR_ONCE_LOGGED \ - bLOG_ERROR_ONCE_LOGGED -#define LOG_ERROR_ONCE(vCONTENT) \ - static bool LOG_ERROR_ONCE_LOGGED = false; \ - if ( ! LOG_ERROR_ONCE_LOGGED ) { \ - LOG_ERROR_ONCE_LOGGED = true; \ - LOG_ERROR(vCONTENT); \ - } +#define LOG_BASIC(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogBasic) +#define LOG_EVENT(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogEvent) +#define LOG_ERROR(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogError) +#define LOG_DATUM(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDatum) -#define LOG_DATUM(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDatum) -#define LOG_DATUM_ONCE_LOGGED \ - bLOG_DATUM_ONCE_LOGGED -#define LOG_DATUM_ONCE(vCONTENT) \ - static bool LOG_DATUM_ONCE_LOGGED = false; \ - if ( ! LOG_DATUM_ONCE_LOGGED ) { \ - LOG_DATUM_ONCE_LOGGED = true; \ - LOG_DATUM(vCONTENT); \ - } - // forward declarations class tst_logging; @@ -82,36 +58,49 @@ // friends friend class ::tst_logging; - -public: +public : enum LogType { + eLogBasic, eLogEvent, eLogError, eLogDatum, eLogType_Count, - }; + }; private: QDir _dir; QHash _logPathNames; QHash _logBasePathNames { - { eLogEvent, "log/" }, - { eLogDatum, "log/" }, - { eLogError, "log/" }, + { LogType::eLogBasic, "log/" }, + { LogType::eLogEvent, "log/" }, + { LogType::eLogDatum, "log/" }, + { LogType::eLogError, "log/" }, }; - QHash _logPrefix { - { eLogEvent, "E" }, - { eLogDatum, "D" }, - { eLogError, "" }, // it has its own file and all the content are Errors + QHash _logPrefix { // Will be used for the logging in the file + { LogType::eLogBasic, "" }, // Object itself tells what it is + { LogType::eLogEvent, "E" }, + { LogType::eLogDatum, "D" }, + { LogType::eLogError, "" }, // it has its own file and all the content is Error }; + QHash _logTypeName { // Will be used for for information + { LogType::eLogBasic, "Basic" }, // Object itself tells what it is + { LogType::eLogEvent, "Event" }, + { LogType::eLogDatum, "Datum" }, + { LogType::eLogError, "Error" }, // it has its own file and all the content is Error + }; + QHash _logFileNameBase { + { LogType::eLogBasic, "denali.log" }, + { LogType::eLogEvent, "denali.log" }, + { LogType::eLogDatum, "denali.log" }, + { LogType::eLogError, "denali.err" }, + }; const char *_dateFormat = "yyyy_MM_dd"; const char *_timeFormat = "HH:mm:ss"; const char *_dateSeparator = "_"; // used in filename - const char *_prefixSeparator = ","; - const char *_timeSeparator = ","; + const char *_separator = ","; QString _logFileName = "";