bitlair/bitvis
8
0
Fork 0
Code Activity Actions

fixed: don't save logstrings when the log isn't opened yet, these tools don't really need logfiles

Browse source
This commit is contained in:
Bob van Loosen 2013-02-21 21:59:54 +01:00
parent 267b0d17bf
commit 5e145c4c2d
1 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/util/log.cpp
View file

@ -46,7 +46,6 @@ static ofstream* g_logfile;
static int g_logbuffsize; //size of the buffer static int g_logbuffsize; //size of the buffer
static char* g_logbuff; //buffer for vsnprintf static char* g_logbuff; //buffer for vsnprintf
static vector<string>* g_logstrings; //we save any log lines here while the log isn't open
//returns hour:minutes:seconds:microseconds //returns hour:minutes:seconds:microseconds
string GetStrTime() string GetStrTime()
@ -185,27 +184,9 @@ void PrintLog (const char* fmt, const char* function, LogLevel loglevel, ...)
if (nrspaces > 0) if (nrspaces > 0)
funcstr.insert(funcstr.length(), nrspaces, ' '); funcstr.insert(funcstr.length(), nrspaces, ' ');
//write the string to the logfile
if (g_logfile && g_logfile->is_open() && g_printlogtofile) if (g_logfile && g_logfile->is_open() && g_printlogtofile)
{
//print any saved log lines
if (g_logstrings)
{
for (vector<string>::iterator it = g_logstrings->begin(); it != g_logstrings->end(); it++)
*g_logfile << *it << flush;
delete g_logstrings;
g_logstrings = NULL;
}
//write the string to the logfile
*g_logfile << GetStrTime() << " " << funcstr << " " << logstr << '\n' << flush; *g_logfile << GetStrTime() << " " << funcstr << " " << logstr << '\n' << flush;
}
else if (g_printlogtofile)
{
//save the log line if the log isn't open yet
if (!g_logstrings)
g_logstrings = new vector<string>;
g_logstrings->push_back(GetStrTime() + " " + funcstr + " " + logstr + '\n');
}
//print to stdout when requested //print to stdout when requested
if (g_logtostderr) if (g_logtostderr)