nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-31 09:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log unused config options (#999)

Browse Source 
Now fixed
This commit is contained in:
Stoabrogga
2018-09-08 20:26:28 +02:00
committed by Barbz
parent fa65a8070a
commit 205e8eb14e
3 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/common/Configuration/Config.cpp
View File

@@ -6,6 +6,7 @@
#include "Config.h" #include "Config.h"
#include "Errors.h" #include "Errors.h"
#include "Log.h"
// Defined here as it must not be exposed to end-users. // Defined here as it must not be exposed to end-users.
bool ConfigMgr::GetValueHelper(const char* name, ACE_TString &result) bool ConfigMgr::GetValueHelper(const char* name, ACE_TString &result)
@@ -83,33 +84,61 @@ bool ConfigMgr::LoadData(char const* file)
return false; return false;
} }
std::string ConfigMgr::GetStringDefault(const char* name, const std::string &def) std::string ConfigMgr::GetStringDefault(const char* name, const std::string &def, bool logUnused /*= true*/)
{ {
ACE_TString val; ACE_TString val;
return GetValueHelper(name, val) ? val.c_str() : def;
if (GetValueHelper(name, val))
return val.c_str();
else
{
if (logUnused)
sLog->outError("-> Not found option '%s'. The default value is used (%s)", name, def.c_str());
return def;
}
} }
bool ConfigMgr::GetBoolDefault(const char* name, bool def) bool ConfigMgr::GetBoolDefault(const char* name, bool def, bool logUnused /*= true*/)
{ {
ACE_TString val; ACE_TString val;
if (!GetValueHelper(name, val)) if (!GetValueHelper(name, val))
{
if (logUnused)
def ? sLog->outError("-> Not found option '%s'. The default value is used (Yes)", name) : sLog->outError("-> Not found option '%s'. The default value is used (No)", name);
return def; return def;
}
return (val == "true" || val == "TRUE" || val == "yes" || val == "YES" || return (val == "true" || val == "TRUE" || val == "yes" || val == "YES" ||
val == "1"); val == "1");
} }
int ConfigMgr::GetIntDefault(const char* name, int def) int ConfigMgr::GetIntDefault(const char* name, int def, bool logUnused /*= true*/)
{ {
ACE_TString val; ACE_TString val;
return GetValueHelper(name, val) ? atoi(val.c_str()) : def;
if (GetValueHelper(name, val))
return atoi(val.c_str());
else
{
if (logUnused)
sLog->outError("-> Not found option '%s'. The default value is used (%i)", name, def);
return def;
}
} }
float ConfigMgr::GetFloatDefault(const char* name, float def) float ConfigMgr::GetFloatDefault(const char* name, float def, bool logUnused /*= true*/)
{ {
ACE_TString val; ACE_TString val;
return GetValueHelper(name, val) ? (float)atof(val.c_str()) : def;
if (GetValueHelper(name, val))
return (float)atof(val.c_str());
else
{
if (logUnused)
sLog->outError("-> Not found option '%s'. The default value is used (%f)", name, def);
return def;
}
} }
std::list<std::string> ConfigMgr::GetKeysByString(std::string const& name) std::list<std::string> ConfigMgr::GetKeysByString(std::string const& name)

8
src/common/Configuration/Config.h
View File

@@ -39,10 +39,10 @@ public:
bool Reload(); bool Reload();
std::string GetStringDefault(const char* name, const std::string& def); std::string GetStringDefault(const char* name, const std::string& def, bool logUnused = true);
bool GetBoolDefault(const char* name, bool def); bool GetBoolDefault(const char* name, bool def, bool logUnused = true);
int GetIntDefault(const char* name, int def); int GetIntDefault(const char* name, int def, bool logUnused = true);
float GetFloatDefault(const char* name, float def); float GetFloatDefault(const char* name, float def, bool logUnused = true);
std::list<std::string> GetKeysByString(std::string const& name); std::list<std::string> GetKeysByString(std::string const& name);

38
src/common/Logging/Log.cpp
View File

@@ -88,16 +88,16 @@ void Log::SetLogFileLevel(char *Level)
void Log::Initialize() void Log::Initialize()
{ {
/// Check whether we'll log GM commands/RA events/character outputs/chat stuffs /// Check whether we'll log GM commands/RA events/character outputs/chat stuffs
m_dbChar = sConfigMgr->GetBoolDefault("LogDB.Char", false); m_dbChar = sConfigMgr->GetBoolDefault("LogDB.Char", false, false);
m_dbRA = sConfigMgr->GetBoolDefault("LogDB.RA", false); m_dbRA = sConfigMgr->GetBoolDefault("LogDB.RA", false, false);
m_dbGM = sConfigMgr->GetBoolDefault("LogDB.GM", false); m_dbGM = sConfigMgr->GetBoolDefault("LogDB.GM", false, false);
m_dbChat = sConfigMgr->GetBoolDefault("LogDB.Chat", false); m_dbChat = sConfigMgr->GetBoolDefault("LogDB.Chat", false, false);
/// Realm must be 0 by default /// Realm must be 0 by default
SetRealmID(0); SetRealmID(0);
/// Common log files data /// Common log files data
m_logsDir = sConfigMgr->GetStringDefault("LogsDir", ""); m_logsDir = sConfigMgr->GetStringDefault("LogsDir", "", false);
if (!m_logsDir.empty()) if (!m_logsDir.empty())
if ((m_logsDir.at(m_logsDir.length() - 1) != '/') && (m_logsDir.at(m_logsDir.length() - 1) != '\\')) if ((m_logsDir.at(m_logsDir.length() - 1) != '/') && (m_logsDir.at(m_logsDir.length() - 1) != '\\'))
m_logsDir.push_back('/'); m_logsDir.push_back('/');
@@ -106,18 +106,18 @@ void Log::Initialize()
/// Open specific log files /// Open specific log files
logfile = openLogFile("LogFile", "LogTimestamp", "w"); logfile = openLogFile("LogFile", "LogTimestamp", "w");
InitColors(sConfigMgr->GetStringDefault("LogColors", "")); InitColors(sConfigMgr->GetStringDefault("LogColors", "", false));
m_gmlog_per_account = sConfigMgr->GetBoolDefault("GmLogPerAccount", false); m_gmlog_per_account = sConfigMgr->GetBoolDefault("GmLogPerAccount", false, false);
if (!m_gmlog_per_account) if (!m_gmlog_per_account)
gmLogfile = openLogFile("GMLogFile", "GmLogTimestamp", "a"); gmLogfile = openLogFile("GMLogFile", "GmLogTimestamp", "a");
else else
{ {
// GM log settings for per account case // GM log settings for per account case
m_gmlog_filename_format = sConfigMgr->GetStringDefault("GMLogFile", ""); m_gmlog_filename_format = sConfigMgr->GetStringDefault("GMLogFile", "", false);
if (!m_gmlog_filename_format.empty()) if (!m_gmlog_filename_format.empty())
{ {
bool m_gmlog_timestamp = sConfigMgr->GetBoolDefault("GmLogTimestamp", false); bool m_gmlog_timestamp = sConfigMgr->GetBoolDefault("GmLogTimestamp", false, false);
size_t dot_pos = m_gmlog_filename_format.find_last_of('.'); size_t dot_pos = m_gmlog_filename_format.find_last_of('.');
if (dot_pos!=m_gmlog_filename_format.npos) if (dot_pos!=m_gmlog_filename_format.npos)
@@ -148,19 +148,19 @@ void Log::Initialize()
miscLogFile = fopen((m_logsDir+"Misc.log").c_str(), "a"); miscLogFile = fopen((m_logsDir+"Misc.log").c_str(), "a");
// Main log file settings // Main log file settings
m_logLevel = sConfigMgr->GetIntDefault("LogLevel", LOGL_NORMAL); m_logLevel = sConfigMgr->GetIntDefault("LogLevel", LOGL_NORMAL, false);
m_logFileLevel = sConfigMgr->GetIntDefault("LogFileLevel", LOGL_NORMAL); m_logFileLevel = sConfigMgr->GetIntDefault("LogFileLevel", LOGL_NORMAL, false);
m_dbLogLevel = sConfigMgr->GetIntDefault("DBLogLevel", LOGL_NORMAL); m_dbLogLevel = sConfigMgr->GetIntDefault("DBLogLevel", LOGL_NORMAL, false);
m_sqlDriverQueryLogging = sConfigMgr->GetBoolDefault("SQLDriverQueryLogging", false); m_sqlDriverQueryLogging = sConfigMgr->GetBoolDefault("SQLDriverQueryLogging", false, false);
m_DebugLogMask = DebugLogFilters(sConfigMgr->GetIntDefault("DebugLogMask", LOG_FILTER_NONE)); m_DebugLogMask = DebugLogFilters(sConfigMgr->GetIntDefault("DebugLogMask", LOG_FILTER_NONE, false));
// Char log settings // Char log settings
m_charLog_Dump = sConfigMgr->GetBoolDefault("CharLogDump", false); m_charLog_Dump = sConfigMgr->GetBoolDefault("CharLogDump", false, false);
m_charLog_Dump_Separate = sConfigMgr->GetBoolDefault("CharLogDump.Separate", false); m_charLog_Dump_Separate = sConfigMgr->GetBoolDefault("CharLogDump.Separate", false, false);
if (m_charLog_Dump_Separate) if (m_charLog_Dump_Separate)
{ {
m_dumpsDir = sConfigMgr->GetStringDefault("CharLogDump.SeparateDir", ""); m_dumpsDir = sConfigMgr->GetStringDefault("CharLogDump.SeparateDir", "", false);
if (!m_dumpsDir.empty()) if (!m_dumpsDir.empty())
if ((m_dumpsDir.at(m_dumpsDir.length() - 1) != '/') && (m_dumpsDir.at(m_dumpsDir.length() - 1) != '\\')) if ((m_dumpsDir.at(m_dumpsDir.length() - 1) != '/') && (m_dumpsDir.at(m_dumpsDir.length() - 1) != '\\'))
m_dumpsDir.push_back('/'); m_dumpsDir.push_back('/');
@@ -178,11 +178,11 @@ void Log::ReloadConfig()
FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFlag, char const* mode) FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFlag, char const* mode)
{ {
std::string logfn=sConfigMgr->GetStringDefault(configFileName, ""); std::string logfn=sConfigMgr->GetStringDefault(configFileName, "", false);
if (logfn.empty()) if (logfn.empty())
return NULL; return NULL;
if (configTimeStampFlag && sConfigMgr->GetBoolDefault(configTimeStampFlag, false)) if (configTimeStampFlag && sConfigMgr->GetBoolDefault(configTimeStampFlag, false, false))
{ {
size_t dot_pos = logfn.find_last_of("."); size_t dot_pos = logfn.find_last_of(".");
if (dot_pos!=logfn.npos) if (dot_pos!=logfn.npos)