ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utility: Fixed file logger using wrong directory for first log file

Browse Source
This commit is contained in:
Eberhard Graether
2016-02-25 14:40:22 +01:00
parent bf0d99c9ba
commit c35419e281
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/logging/FileLogger.cpp
+10 -7
View File
@@ -6,13 +6,14 @@
#include "utility/file/FileSystem.h" #include "utility/file/FileSystem.h"
std::string FileLogger::s_filePath = "data/log/"; std::string FileLogger::s_filePath = "user/log/";
unsigned int FileLogger::s_maxLogCount = 1000; unsigned int FileLogger::s_maxLogCount = 1000;
unsigned int FileLogger::s_amountOfLogFiles = 2; unsigned int FileLogger::s_amountOfLogFiles = 2;
FileLogger::FileLogger() FileLogger::FileLogger()
: Logger("FileLogger") : Logger("FileLogger")
, m_suffix(0) , m_logCount(0)
, m_suffix(1)
{ {
setupFileName(); setupFileName();
changeLogFile(); changeLogFile();
@@ -78,9 +79,10 @@ void FileLogger::setMaxLogCount(unsigned int logCount)
void FileLogger::changeLogFile() void FileLogger::changeLogFile()
{ {
m_suffix = ++m_suffix%s_amountOfLogFiles; m_suffix = ++m_suffix % s_amountOfLogFiles;
m_currentLogFile = s_filePath + m_fileName + char(m_suffix + 48) + ".txt"; m_currentLogFile = m_fileName + (m_suffix ? "1" : "0") + ".txt";
if(FileSystem::exists(m_currentLogFile))
if (FileSystem::exists(m_currentLogFile))
{ {
std::remove(m_currentLogFile.c_str()); std::remove(m_currentLogFile.c_str());
} }
@@ -89,7 +91,7 @@ void FileLogger::changeLogFile()
void FileLogger::logMessage(const std::string& type, const LogMessage& message) void FileLogger::logMessage(const std::string& type, const LogMessage& message)
{ {
std::ofstream fileStream; std::ofstream fileStream;
fileStream.open(m_currentLogFile, std::ios::app); fileStream.open(s_filePath + m_currentLogFile, std::ios::app);
fileStream << message.getTimeString("%H:%M:%S") << " | "; fileStream << message.getTimeString("%H:%M:%S") << " | ";
if (message.filePath.size()) if (message.filePath.size())
@@ -99,7 +101,8 @@ void FileLogger::logMessage(const std::string& type, const LogMessage& message)
fileStream << type << ": " << message.message << std::endl; fileStream << type << ": " << message.message << std::endl;
fileStream.close(); fileStream.close();
if(++m_logCount >= s_maxLogCount)
if (++m_logCount >= s_maxLogCount)
{ {
changeLogFile(); changeLogFile();
m_logCount = 0; m_logCount = 0;
src/lib/utility/logging/FileLogger.h
+1
View File
@@ -32,6 +32,7 @@ private:
unsigned int m_logCount; unsigned int m_logCount;
unsigned int m_suffix; unsigned int m_suffix;
std::string m_currentLogFile; std::string m_currentLogFile;
std::string m_fileName; std::string m_fileName;
}; };