Index: sources/storage/Logger.h =================================================================== diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r6816b783f50e08267aa016d64350bc020080d901 --- sources/storage/Logger.h (.../Logger.h) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) +++ sources/storage/Logger.h (.../Logger.h) (revision 6816b783f50e08267aa016d64350bc020080d901) @@ -28,10 +28,11 @@ #define LOG_EXPORT _Logger.concurrentExportLogs() -#define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug) +#define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug, true ) -#define LOG_EVENT(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogEvent) -#define LOG_DATUM(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDatum) +#define ADD_EVENT_HEADER emit Storage::Logger::I().didLog(_headerE, Storage::Logger::LogType::eLogEvent, false) +#define LOG_EVENT(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogEvent, true ) +#define LOG_DATUM(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDatum, true ) #define MIXED_EVENT_DATUM @@ -88,8 +89,10 @@ eLogType_Count, }; + Q_ENUM(LogType) private: + const char *_headerE = "TimeStamp,Type,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\r\n"; QDir _dir; QString _logFileNamePrefix; QHash _logPathNames; @@ -155,10 +158,14 @@ public: void enableConsoleOut(bool vEnabled); +signals: + void didLogPathSet(Logger::LogType vLogType, const QString &vLogPath); + public slots: bool init(); bool init(QThread &vThread); + private slots: void quit(); @@ -174,6 +181,8 @@ void setLogBasePath (bool vUseApplicationDirPath = false); bool setLogPath (); bool setLogPath (LogType vLogType); +public: + const QString &logPath(Logger::LogType vLogType); // ----- Export structure private : @@ -206,9 +215,9 @@ // ----- logging structure private slots: - void onLog (const QString &vContent, LogType vLogType); + void onLog (const QString &vContent, LogType vLogType, bool vTimestamp); private: - void log (const QString &vContent, LogType vLogType); + void log (const QString &vContent, LogType vLogType, bool vTimestamp); signals: /*! @@ -217,6 +226,6 @@ * \param vContent - content as type of string to be logged * \param vLogType - the type of logging of type Storage::Logger::LogType */ - void didLog (const QString &vContent, LogType vLogType); + void didLog (const QString &vContent, LogType vLogType, bool vTimestamp); }; }