diff --git a/src/blackmisc/filelogger.cpp b/src/blackmisc/filelogger.cpp index f63bc590a..515bb1add 100644 --- a/src/blackmisc/filelogger.cpp +++ b/src/blackmisc/filelogger.cpp @@ -88,16 +88,17 @@ namespace BlackMisc QString CFileLogger::getFullFileName() { - QString filename; + QString filePath; Q_ASSERT(!m_applicationName.isEmpty()); - if (!m_logPath.isEmpty()) filename += m_logPath; - filename += m_applicationName; - filename += QLatin1String("_"); - filename += QDateTime::currentDateTime().toString(QStringLiteral("yyMMddhhmmss")); - filename += QLatin1String("_"); - filename += QString::number(QCoreApplication::applicationPid()); - filename += QLatin1String(".log"); - return filename; + if (!m_logPath.isEmpty()) filePath += m_logPath; + + m_fileName += m_applicationName; + m_fileName += QLatin1String("_"); + m_fileName += QDateTime::currentDateTime().toString(QStringLiteral("yyMMddhhmmss")); + m_fileName += QLatin1String("_"); + m_fileName += QString::number(QCoreApplication::applicationPid()); + m_fileName += QLatin1String(".log"); + return filePath + m_fileName; } void CFileLogger::removeOldLogFiles() diff --git a/src/blackmisc/filelogger.h b/src/blackmisc/filelogger.h index 821b57696..00162782a 100644 --- a/src/blackmisc/filelogger.h +++ b/src/blackmisc/filelogger.h @@ -52,12 +52,17 @@ namespace BlackMisc //! Close file void close(); + //! Get the current log file path + QString getLogFilePath() const { return m_logFile.fileName(); } + + //! Get the current log file name + QString getLogFileName() const { return m_fileName; } + private slots: //! Write single status message to file void ps_writeStatusMessageToFile(const BlackMisc::CStatusMessage &statusMessage); private: - QString getFullFileName(); void removeOldLogFiles(); @@ -66,6 +71,7 @@ namespace BlackMisc CLogPattern m_logPattern; QFile m_logFile; + QString m_fileName; QTextStream m_stream; QString m_applicationName; QString m_logPath; //!< Empty by default. Hence the working directory "." is used