Fixed error log filename date sometimes being incorrect (bug 5761, r=fyren).
authorMatheus Valadares <matheusavs3@gmail.com>
Sat Jun 22 12:21:36 2013 -0400 (2013-06-22)
changeset 3926ff7231bfdd0b
parent 3925 47e48ab11bc3
child 3927 9371ebf3fb35
Fixed error log filename date sometimes being incorrect (bug 5761, r=fyren).
core/Logger.cpp
core/Logger.h
     1.1 --- a/core/Logger.cpp	Tue Jun 18 12:16:48 2013 -0400
     1.2 +++ b/core/Logger.cpp	Sat Jun 22 12:21:36 2013 -0400
     1.3 @@ -212,7 +212,8 @@
     1.4  	time_t t;
     1.5  	GetAdjustedTime(&t);
     1.6  	tm *curtime = localtime(&t);
     1.7 -	m_CurDay = curtime->tm_mday;
     1.8 +	m_NrmCurDay = curtime->tm_mday;
     1.9 +	m_ErrCurDay = curtime->tm_mday;
    1.10  
    1.11  	char _filename[256];
    1.12  	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);
    1.13 @@ -365,12 +366,12 @@
    1.14  			}
    1.15  		}
    1.16  	} else {
    1.17 -		if (m_CurDay != curtime->tm_mday)
    1.18 +		if (m_NrmCurDay != curtime->tm_mday)
    1.19  		{
    1.20  			char _filename[256];
    1.21  			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);
    1.22  			m_NrmFileName.assign(_filename);
    1.23 -			m_CurDay = curtime->tm_mday;
    1.24 +			m_NrmCurDay = curtime->tm_mday;
    1.25  			m_DailyPrintHdr = true;
    1.26  		}
    1.27  		fp = fopen(m_NrmFileName.c_str(), "a+");
    1.28 @@ -420,12 +421,12 @@
    1.29  	GetAdjustedTime(&t);
    1.30  	tm *curtime = localtime(&t);
    1.31  
    1.32 -	if (curtime->tm_mday != m_CurDay)
    1.33 +	if (curtime->tm_mday != m_ErrCurDay)
    1.34  	{
    1.35  		char _filename[256];
    1.36  		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);
    1.37  		m_ErrFileName.assign(_filename);
    1.38 -		m_CurDay = curtime->tm_mday;
    1.39 +		m_ErrCurDay = curtime->tm_mday;
    1.40  		m_ErrMapStart = false;
    1.41  	}
    1.42  
     2.1 --- a/core/Logger.h	Tue Jun 18 12:16:48 2013 -0400
     2.2 +++ b/core/Logger.h	Sat Jun 22 12:21:36 2013 -0400
     2.3 @@ -96,7 +96,8 @@
     2.4  	String m_ErrFileName;
     2.5  	String m_CurMapName;
     2.6  	LoggingMode m_Mode;
     2.7 -	int m_CurDay;
     2.8 +	int m_NrmCurDay;
     2.9 +	int m_ErrCurDay;
    2.10  	bool m_ErrMapStart;
    2.11  	bool m_Active;
    2.12  	bool m_DelayedStart;