Index: sources/storage/logger.cpp =================================================================== diff -u -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/storage/logger.cpp (.../logger.cpp) (revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616) +++ sources/storage/logger.cpp (.../logger.cpp) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -183,6 +183,7 @@ bool Logger::setLogPath() { bool ok = true; + if ( ! setLogPath(LogType::eLogBasic) ) ok = false; if ( ! setLogPath(LogType::eLogEvent) ) ok = false; if ( ! setLogPath(LogType::eLogError) ) ok = false; if ( ! setLogPath(LogType::eLogDatum) ) ok = false; @@ -202,7 +203,7 @@ if ( ! _dir.exists(_logBasePathNames[vLogType]) ) { if ( ! _dir.mkpath(_logBasePathNames[vLogType]) ) { LOG_ERROR(tr("Can't create %1 log path (%2)") - .arg(_logPrefix[vLogType]) + .arg(_logTypeName [vLogType]) .arg(_logPathNames[vLogType]) ); return false; @@ -219,42 +220,39 @@ * \note This method is not thread-safe so is private and needs to be called by concurrentLog * Which uses QtConcurrent::run to run in thread and thread-safe. */ -void Logger::log(const QString &vContent, Logger::LogType vLogType) +void Logger::log(const QString &vContent, LogType vLogType) { QString date = QDate::currentDate().toString(_dateFormat); QString fileName = date + _dateSeparator; - QString mContent; switch (vLogType) { - case eLogEvent: - fileName += Log_File_Name_Event; + case LogType::eLogBasic: + case LogType::eLogEvent: + case LogType::eLogDatum: + case LogType::eLogError: + fileName += _logFileNameBase[vLogType]; break; - case eLogDatum: - fileName += Log_File_Name_Datum; - break; - - case eLogError: - fileName += Log_File_Name_Error; - break; - default: - fileName += Log_File_Name_Error; + fileName += _logFileNameBase[LogType::eLogError]; LOG_ERROR(tr("Incorrect type of logging %1").arg(vLogType)); } + QString mContent = QTime::currentTime().toString(_timeFormat) + _separator; + QString logPrefix = _logPrefix[vLogType]; if ( ! logPrefix.isEmpty()) { mContent += logPrefix; - mContent += _prefixSeparator; + mContent += _separator; } - mContent += QTime::currentTime().toString(_timeFormat); - mContent += _timeSeparator + vContent; + mContent += vContent; + + QString logPathName = _logPathNames[vLogType]; if (logPathName.isEmpty()) logPathName = _logPathNames[LogType::eLogError]; _logFileName = logPathName + fileName; FileHandler::write(_logFileName, mContent + "\r\n", true); - if (vLogType == eLogError) { + if (vLogType == LogType::eLogError) { #ifdef QT_DEBUG //mContent.prepend("\033[1;31m --- @ --- \033[0m"); mContent.prepend(" @ ");