Index: sources/storage/logger.cpp =================================================================== diff -u -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 --- sources/storage/logger.cpp (.../logger.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) +++ sources/storage/logger.cpp (.../logger.cpp) (revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616) @@ -50,7 +50,7 @@ checkLogPath(); initConnections(); - LOG_EVENT(QObject::tr("%1 Initialized").arg(metaObject()->className())); + LOG_EVENT("UI," + tr("%1 Initialized").arg(metaObject()->className())); return true; } @@ -169,7 +169,7 @@ { if (vUseApplicationDirPath) { _dir.setPath(qApp->applicationDirPath()); - LOG_EVENT(tr("Application Dir Path used for events logging (%1)").arg(_dir.path())); + LOG_EVENT(tr("Application path used for events logging (%1)").arg(_dir.path())); } else { _dir.setPath(Log_Base_Path_Name); } @@ -202,8 +202,8 @@ if ( ! _dir.exists(_logBasePathNames[vLogType]) ) { if ( ! _dir.mkpath(_logBasePathNames[vLogType]) ) { LOG_ERROR(tr("Can't create %1 log path (%2)") - .arg(_logPrefix[vLogType]) - .arg(_logPathNames[vLogType]) + .arg(_logPrefix[vLogType]) + .arg(_logPathNames[vLogType]) ); return false; } @@ -222,25 +222,33 @@ void Logger::log(const QString &vContent, Logger::LogType vLogType) { QString date = QDate::currentDate().toString(_dateFormat); + QString fileName = date + _dateSeparator; QString mContent; - switch (vLogType) { case eLogEvent: - case eLogError: + fileName += Log_File_Name_Event; + break; + case eLogDatum: + fileName += Log_File_Name_Datum; break; + case eLogError: + fileName += Log_File_Name_Error; + break; + default: - LOG_ERROR(tr("Incorrect type of logging").arg(vLogType)); + fileName += Log_File_Name_Error; + LOG_ERROR(tr("Incorrect type of logging %1").arg(vLogType)); } QString logPrefix = _logPrefix[vLogType]; - if (logPrefix.isEmpty()) logPrefix = _logPrefix[LogType::eLogError]; - mContent += logPrefix; - mContent += _prefixSeparator; + if ( ! logPrefix.isEmpty()) { + mContent += logPrefix; + mContent += _prefixSeparator; + } mContent += QTime::currentTime().toString(_timeFormat); mContent += _timeSeparator + vContent; - QString fileName = date + _dateSeparator + Log_File_Name; QString logPathName = _logPathNames[vLogType]; if (logPathName.isEmpty()) logPathName = _logPathNames[LogType::eLogError];