Index: sources/storage/Logger.cpp =================================================================== diff -u -rb043c5b9919a9a435e50907772ec8346823b05d6 -rfe30c662d0fdf9df32883c17772b5803b84d229e --- sources/storage/Logger.cpp (.../Logger.cpp) (revision b043c5b9919a9a435e50907772ec8346823b05d6) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision fe30c662d0fdf9df32883c17772b5803b84d229e) @@ -7,7 +7,7 @@ * * \file Logger.cpp * \author (last) Behrouz NematiPour - * \date (last) 09-Feb-2024 + * \date (last) 12-Mar-2024 * \author (original) Behrouz NematiPour * \date (original) 26-Aug-2020 * @@ -40,7 +40,11 @@ * \param parent - QObject parent owner object. * Qt handles the children destruction by their parent objects life-cycle. */ -Logger::Logger(QObject *parent) : QObject(parent) {} +Logger::Logger(QObject *parent) : QObject(parent) { + if ( ! gLongLogName ) { + _fileDateFormat = "yyyy_MM_dd"; // date used in the file name + } +} /*! * \brief Logger::init @@ -338,15 +342,22 @@ _logFileNameTime = QDateTime::currentDateTime().time().toString(_fileTimeFormat); } - QString fileName = _logFileNameDate - + _fileSeparator + _logFileNameTime - + _fileSeparator + _logFileNameHDSN - + _fileSeparator + _logFileNameMode - ; + QString fileName; + if ( ! gLongLogName ) { + fileName = _logFileNameDate + + _fileSeparator + "denali"; + } + else { + fileName = _logFileNameDate + + _fileSeparator + _logFileNameTime + + _fileSeparator + _logFileNameHDSN + + _fileSeparator + _logFileNameMode + ; + } // case LogType::eLogTrtmt: // this type of log will never happen here. Only put here to make sure it is intentional. switch (vLogType) { case LogType::eLogAppED: { - // ------------------------------------------------------------------------ TODO: Improve : fucntion declaration + // ------------------------------------------------------------------------ TODO: Improve : function declaration fileName += _logFileNameExt[vLogType]; static QString oFileName; if( oFileName != fileName ) { @@ -361,7 +372,7 @@ } break; case LogType::eLogDebug: { - // ------------------------------------------------------------------------ TODO: Improve : fucntion declaration + // ------------------------------------------------------------------------ TODO: Improve : function declaration fileName += _logFileNameExt[vLogType]; static QString oFileName; if( oFileName != fileName ) { @@ -537,7 +548,7 @@ quint32 opMode = vData[0].toUInt(&ok); if ( ! ok ) return; quint32 subMode = vData[1].toUInt(&ok); if ( ! ok ) return; QString mode; - if ( subMode >= GuiHDStandbyStates::STANDBY_WAIT_FOR_DISINFECT_STATE ) { + if ( opMode == GuiHDOpModes::MODE_STAN && subMode >= GuiHDStandbyStates::STANDBY_WAIT_FOR_DISINFECT_STATE ) { mode = "Disinfect"; if( _logFileNameMode != mode ) { _logFileNameMode = mode; @@ -606,6 +617,11 @@ auto logFile = { vLogType }; // Is mostly used for the txr files which are in separate partition. for ( const auto &iType : ( vLogType == eLogFiles ? logFiles : logFile ) ) { + // The Application does not have access to remove the CloudSync logs, + // therefore sends CloudSync a message with expected used percent of the log files, + // to remove the logs. + if ( iType == eLogCloud ) { emit didRetentionLogCS(_logTypeMaxUsageLimit[iType]); continue; } + QString mCSource = _logPathNames [iType]; QString mCExtension = _logFileNameExt[iType]; // DEBUG: qDebug() << "@" << mCSource << mLogFileFilter << mCExtension << iType << _logTypeMaxUsageLimit[iType];