UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed error log filename date sometimes being incorrect (bug 5761, r=fyren).

Browse Source
This commit is contained in:
Matheus Valadares 2013-06-22 12:21:36 -04:00
parent 0533b5cefc
commit 157c8d5e54
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/Logger.cpp
View File

@ -212,7 +212,8 @@ void Logger::InitLogger(LoggingMode mode)
time_t t; time_t t;
GetAdjustedTime(&t); GetAdjustedTime(&t);
tm *curtime = localtime(&t); tm *curtime = localtime(&t);
m_CurDay = curtime->tm_mday; m_NrmCurDay = curtime->tm_mday;
m_ErrCurDay = curtime->tm_mday;
char _filename[256]; char _filename[256];
g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday); g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
@ -365,12 +366,12 @@ void Logger::LogMessageEx(const char *vafmt, va_list ap)
} }
} }
} else { } else {
if (m_CurDay != curtime->tm_mday) if (m_NrmCurDay != curtime->tm_mday)
{ {
char _filename[256]; char _filename[256];
g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday); g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
m_NrmFileName.assign(_filename); m_NrmFileName.assign(_filename);
m_CurDay = curtime->tm_mday; m_NrmCurDay = curtime->tm_mday;
m_DailyPrintHdr = true; m_DailyPrintHdr = true;
} }
fp = fopen(m_NrmFileName.c_str(), "a+"); fp = fopen(m_NrmFileName.c_str(), "a+");
@ -420,12 +421,12 @@ void Logger::LogErrorEx(const char *vafmt, va_list ap)
GetAdjustedTime(&t); GetAdjustedTime(&t);
tm *curtime = localtime(&t); tm *curtime = localtime(&t);
if (curtime->tm_mday != m_CurDay) if (curtime->tm_mday != m_ErrCurDay)
{ {
char _filename[256]; char _filename[256];
g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday); g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
m_ErrFileName.assign(_filename); m_ErrFileName.assign(_filename);
m_CurDay = curtime->tm_mday; m_ErrCurDay = curtime->tm_mday;
m_ErrMapStart = false; m_ErrMapStart = false;
} }

3
core/Logger.h
View File

@ -96,7 +96,8 @@ private:
String m_ErrFileName; String m_ErrFileName;
String m_CurMapName; String m_CurMapName;
LoggingMode m_Mode; LoggingMode m_Mode;
int m_CurDay; int m_NrmCurDay;
int m_ErrCurDay;
bool m_ErrMapStart; bool m_ErrMapStart;
bool m_Active; bool m_Active;
bool m_DelayedStart; bool m_DelayedStart;