diff options
Diffstat (limited to 'src/server/shared/Logging/Log.cpp')
| -rwxr-xr-x | src/server/shared/Logging/Log.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index eaff7cbd8fa..3c6a1882259 100755 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -78,7 +78,7 @@ void Log::SetLogLevel(char *Level) NewLevel = 0; m_logLevel = NewLevel; - outString( "LogLevel is %u",m_logLevel ); + outString( "LogLevel is %u", m_logLevel ); } void Log::SetLogFileLevel(char *Level) @@ -88,7 +88,7 @@ void Log::SetLogFileLevel(char *Level) NewLevel = 0; m_logFileLevel = NewLevel; - outString( "LogFileLevel is %u",m_logFileLevel ); + outString( "LogFileLevel is %u", m_logFileLevel ); } void Log::SetDBLogLevel(char *Level) @@ -98,7 +98,7 @@ void Log::SetDBLogLevel(char *Level) NewLevel = 0; m_dbLogLevel = NewLevel; - outString( "DBLogLevel is %u",m_dbLogLevel ); + outString( "DBLogLevel is %u", m_dbLogLevel ); } void Log::Initialize() @@ -113,7 +113,7 @@ void Log::Initialize() SetRealmID(0); /// Common log files data - m_logsDir = sConfig->GetStringDefault("LogsDir",""); + m_logsDir = sConfig->GetStringDefault("LogsDir", ""); if (!m_logsDir.empty()) if ((m_logsDir.at(m_logsDir.length() - 1) != '/') && (m_logsDir.at(m_logsDir.length() - 1) != '\\')) m_logsDir.append("/"); @@ -121,27 +121,27 @@ void Log::Initialize() m_logsTimestamp = "_" + GetTimestampStr(); /// Open specific log files - logfile = openLogFile("LogFile","LogTimestamp","w"); + logfile = openLogFile("LogFile", "LogTimestamp", "w"); InitColors(sConfig->GetStringDefault("LogColors", "")); - m_gmlog_per_account = sConfig->GetBoolDefault("GmLogPerAccount",false); + m_gmlog_per_account = sConfig->GetBoolDefault("GmLogPerAccount", false); if(!m_gmlog_per_account) - gmLogfile = openLogFile("GMLogFile","GmLogTimestamp","a"); + gmLogfile = openLogFile("GMLogFile", "GmLogTimestamp", "a"); else { // GM log settings for per account case m_gmlog_filename_format = sConfig->GetStringDefault("GMLogFile", ""); if(!m_gmlog_filename_format.empty()) { - bool m_gmlog_timestamp = sConfig->GetBoolDefault("GmLogTimestamp",false); + bool m_gmlog_timestamp = sConfig->GetBoolDefault("GmLogTimestamp", false); size_t dot_pos = m_gmlog_filename_format.find_last_of("."); if(dot_pos!=m_gmlog_filename_format.npos) { if(m_gmlog_timestamp) - m_gmlog_filename_format.insert(dot_pos,m_logsTimestamp); + m_gmlog_filename_format.insert(dot_pos, m_logsTimestamp); - m_gmlog_filename_format.insert(dot_pos,"_#%u"); + m_gmlog_filename_format.insert(dot_pos, "_#%u"); } else { @@ -159,7 +159,7 @@ void Log::Initialize() dberLogfile = openLogFile("DBErrorLogFile", NULL, "a"); raLogfile = openLogFile("RaLogFile", NULL, "a"); chatLogfile = openLogFile("ChatLogFile", "ChatLogTimestamp", "a"); - arenaLogFile = openLogFile("ArenaLogFile", NULL,"a"); + arenaLogFile = openLogFile("ArenaLogFile", NULL, "a"); sqlLogFile = openLogFile("SQLDriverLogFile", NULL, "a"); // Main log file settings @@ -182,17 +182,17 @@ void Log::Initialize() } } -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=sConfig->GetStringDefault(configFileName, ""); if(logfn.empty()) return NULL; - if(configTimeStampFlag && sConfig->GetBoolDefault(configTimeStampFlag,false)) + if(configTimeStampFlag && sConfig->GetBoolDefault(configTimeStampFlag, false)) { size_t dot_pos = logfn.find_last_of("."); if(dot_pos!=logfn.npos) - logfn.insert(dot_pos,m_logsTimestamp); + logfn.insert(dot_pos, m_logsTimestamp); else logfn += m_logsTimestamp; } @@ -206,7 +206,7 @@ FILE* Log::openGmlogPerAccount(uint32 account) return NULL; char namebuf[TRINITY_PATH_MAX]; - snprintf(namebuf,TRINITY_PATH_MAX,m_gmlog_filename_format.c_str(),account); + snprintf(namebuf, TRINITY_PATH_MAX, m_gmlog_filename_format.c_str(), account); return fopen(namebuf, "a"); } @@ -220,7 +220,7 @@ void Log::outTimestamp(FILE* file) // HH hour (2 digits 00-23) // MM minutes (2 digits 00-59) // SS seconds (2 digits 00-59) - fprintf(file,"%-4d-%02d-%02d %02d:%02d:%02d ",aTm->tm_year+1900,aTm->tm_mon+1,aTm->tm_mday,aTm->tm_hour,aTm->tm_min,aTm->tm_sec); + fprintf(file, "%-4d-%02d-%02d %02d:%02d:%02d ", aTm->tm_year+1900, aTm->tm_mon+1, aTm->tm_mday, aTm->tm_hour, aTm->tm_min, aTm->tm_sec); } void Log::InitColors(const std::string& str) @@ -262,9 +262,9 @@ void Log::SetColor(bool stdout_stream, ColorTypes color) FOREGROUND_GREEN, // GREEN FOREGROUND_RED | FOREGROUND_GREEN, // BROWN FOREGROUND_BLUE, // BLUE - FOREGROUND_RED | FOREGROUND_BLUE,// MAGENTA + FOREGROUND_RED | FOREGROUND_BLUE, // MAGENTA FOREGROUND_GREEN | FOREGROUND_BLUE, // CYAN - FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,// WHITE + FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, // WHITE // YELLOW FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // RED_BOLD @@ -347,7 +347,7 @@ std::string Log::GetTimestampStr() // MM minutes (2 digits 00-59) // SS seconds (2 digits 00-59) char buf[20]; - snprintf(buf,20,"%04d-%02d-%02d_%02d-%02d-%02d",aTm->tm_year+1900,aTm->tm_mon+1,aTm->tm_mday,aTm->tm_hour,aTm->tm_min,aTm->tm_sec); + snprintf(buf, 20, "%04d-%02d-%02d_%02d-%02d-%02d", aTm->tm_year+1900, aTm->tm_mon+1, aTm->tm_mday, aTm->tm_hour, aTm->tm_min, aTm->tm_sec); return std::string(buf); } @@ -386,7 +386,7 @@ void Log::outString(const char * str, ...) } if (m_colored) - SetColor(true,m_colors[LOGL_NORMAL]); + SetColor(true, m_colors[LOGL_NORMAL]); va_list ap; @@ -439,7 +439,7 @@ void Log::outCrash(const char * err, ...) } if (m_colored) - SetColor(false,LRED); + SetColor(false, LRED); va_list ap; @@ -482,7 +482,7 @@ void Log::outError(const char * err, ...) } if (m_colored) - SetColor(false,LRED); + SetColor(false, LRED); va_list ap; @@ -560,7 +560,7 @@ void Log::outErrorDb(const char * err, ...) return; if (m_colored) - SetColor(false,LRED); + SetColor(false, LRED); va_list ap; @@ -617,7 +617,7 @@ void Log::outBasic(const char * str, ...) if (m_logLevel > LOGL_NORMAL) { if (m_colored) - SetColor(true,m_colors[LOGL_BASIC]); + SetColor(true, m_colors[LOGL_BASIC]); va_list ap; va_start(ap, str); @@ -661,7 +661,7 @@ void Log::outDetail(const char * str, ...) if (m_logLevel > LOGL_BASIC) { if (m_colored) - SetColor(true,m_colors[LOGL_DETAIL]); + SetColor(true, m_colors[LOGL_DETAIL]); va_list ap; va_start(ap, str); @@ -735,7 +735,7 @@ void Log::outDebug(DebugLogFilters f, const char * str, ...) if( m_logLevel > LOGL_DETAIL ) { if (m_colored) - SetColor(true,m_colors[LOGL_DEBUG]); + SetColor(true, m_colors[LOGL_DEBUG]); va_list ap; va_start(ap, str); @@ -780,7 +780,7 @@ void Log::outStaticDebug(const char * str, ...) if( m_logLevel > LOGL_DETAIL ) { if (m_colored) - SetColor(true,m_colors[LOGL_DEBUG]); + SetColor(true, m_colors[LOGL_DEBUG]); va_list ap; va_start(ap, str); @@ -845,7 +845,7 @@ void Log::outCommand(uint32 account, const char * str, ...) if (m_logLevel > LOGL_NORMAL) { if (m_colored) - SetColor(true,m_colors[LOGL_BASIC]); + SetColor(true, m_colors[LOGL_BASIC]); va_list ap; va_start(ap, str); |