diff --git a/BaseCommon/LogFileTarget.cpp b/BaseCommon/LogFileTarget.cpp index d99d09e..081222d 100644 --- a/BaseCommon/LogFileTarget.cpp +++ b/BaseCommon/LogFileTarget.cpp @@ -21,19 +21,19 @@ #include #include #include +#include #include "LogFileTarget.h" -#define LOG_FILE_ROOT "dstargateway" - -CLogFileTarget::CLogFileTarget(LOG_SEVERITY logLevel, const std::string & dir, bool rotate) : +CLogFileTarget::CLogFileTarget(LOG_SEVERITY logLevel, const std::string & dir, const std::string& fileRoot, bool rotate) : CLogTarget(logLevel), m_dir(dir), +m_fileRoot(fileRoot), m_rotate(rotate), m_file(), m_day(0) { - + assert(!fileRoot.empty()); } CLogFileTarget::~CLogFileTarget() @@ -53,7 +53,7 @@ void CLogFileTarget::printLogIntFixed(const std::string& msg) std::string filename(m_dir); if(filename[filename.length() - 1U] != '/') filename.push_back('/'); - filename.append(LOG_FILE_ROOT).append(".log"); + filename.append(m_fileRoot).append(".log"); m_file.open(filename, std::ios::app); if(m_file.is_open()) { @@ -80,7 +80,7 @@ void CLogFileTarget::printLogIntRotate(const std::string& msg) if(filename[filename.length() - 1U] != '/') filename.push_back('/'); char buf[64]; std::strftime(buf, 42, "-%Y-%m-%d", now_tm); - filename.append(LOG_FILE_ROOT).append(buf).append(".log"); + filename.append(m_fileRoot).append(buf).append(".log"); m_file.open(filename, std::ios::app); if(!m_file.is_open()) { std::cerr << "FAILED TO OPEN LOG FILE :" << filename; diff --git a/BaseCommon/LogFileTarget.h b/BaseCommon/LogFileTarget.h index 8df8c8b..10dc77d 100644 --- a/BaseCommon/LogFileTarget.h +++ b/BaseCommon/LogFileTarget.h @@ -26,7 +26,7 @@ class CLogFileTarget : public CLogTarget { public: - CLogFileTarget(LOG_SEVERITY logLevel, const std::string& directory, bool rotate); + CLogFileTarget(LOG_SEVERITY logLevel, const std::string& directory, const std::string& fileRoot, bool rotate); ~CLogFileTarget(); protected: @@ -37,6 +37,7 @@ private: void printLogIntFixed(const std::string& msg); std::string buildFileName(); std::string m_dir; + std::string m_fileRoot; bool m_rotate; std::fstream m_file; int m_day;