Index: sources/storage/Logger.cpp =================================================================== diff -u -r2467780df22b7fdfb309612abe987d116a657327 -r14cd1c61c1b956e7605d63be7450657817d17355 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 2467780df22b7fdfb309612abe987d116a657327) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 14cd1c61c1b956e7605d63be7450657817d17355) @@ -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;