* added comsole log time and related config option

This commit is contained in:
false_genesis 2009-04-20 18:53:49 +00:00
parent 5e7190551e
commit 722ff4d7db
4 changed files with 27 additions and 3 deletions

View File

@ -13,6 +13,9 @@
// 3=max, 0=no debug output // 3=max, 0=no debug output
debug=0 debug=0
// log time to console?
logtime=1
// defines if the program should quit on error/exception or stay opened (for debugging) // defines if the program should quit on error/exception or stay opened (for debugging)
exitonerror=0 exitonerror=0

View File

@ -550,6 +550,7 @@ void PseuInstanceConf::ApplyFromVarSet(VarSet &v)
// cleanups, internal settings, etc. // cleanups, internal settings, etc.
log_setloglevel(debug); log_setloglevel(debug);
log_setlogtime((bool)atoi(v.Get("LOGTIME").c_str()));
MemoryDataHolder::SetThreadCount(dataLoaderThreads); MemoryDataHolder::SetThreadCount(dataLoaderThreads);
} }

View File

@ -8,7 +8,7 @@
FILE *logfile = NULL; FILE *logfile = NULL;
uint8 loglevel = 0; uint8 loglevel = 0;
bool logtime = false;
void log_prepare(char *fn, char *mode = NULL) void log_prepare(char *fn, char *mode = NULL)
{ {
@ -27,12 +27,19 @@ void log_setloglevel(uint8 lvl)
loglevel = lvl; loglevel = lvl;
} }
void log_setlogtime(bool b)
{
logtime = b;
}
void log(const char *str, ...) void log(const char *str, ...)
{ {
if(!str) if(!str)
return; return;
va_list ap; va_list ap;
_log_setcolor(true,GREY); _log_setcolor(true,GREY);
if(logtime)
printf("%s ", GetTimeString().c_str());
va_start(ap, str); va_start(ap, str);
vprintf( str, ap ); vprintf( str, ap );
va_end(ap); va_end(ap);
@ -58,6 +65,8 @@ void logdetail(const char *str, ...)
return; return;
va_list ap; va_list ap;
_log_setcolor(true,LCYAN); _log_setcolor(true,LCYAN);
if(logtime)
printf("%s ", GetTimeString().c_str());
va_start(ap, str); va_start(ap, str);
vprintf( str, ap ); vprintf( str, ap );
va_end(ap); va_end(ap);
@ -83,6 +92,8 @@ void logdebug(const char *str, ...)
return; return;
va_list ap; va_list ap;
_log_setcolor(true,LBLUE); _log_setcolor(true,LBLUE);
if(logtime)
printf("%s ", GetTimeString().c_str());
va_start(ap, str); va_start(ap, str);
vprintf( str, ap ); vprintf( str, ap );
va_end(ap); va_end(ap);
@ -109,6 +120,8 @@ void logdev(const char *str, ...)
return; return;
va_list ap; va_list ap;
_log_setcolor(true,LMAGENTA); _log_setcolor(true,LMAGENTA);
if(logtime)
printf("%s ", GetTimeString().c_str());
va_start(ap, str); va_start(ap, str);
vprintf( str, ap ); vprintf( str, ap );
va_end(ap); va_end(ap);
@ -133,6 +146,8 @@ void logerror(const char *str, ...)
{ {
va_list ap; va_list ap;
_log_setcolor(false,LRED); _log_setcolor(false,LRED);
if(logtime)
printf("%s ", GetTimeString().c_str());
va_start(ap, str); va_start(ap, str);
vfprintf( stderr, str, ap ); vfprintf( stderr, str, ap );
va_end(ap); va_end(ap);
@ -156,6 +171,8 @@ void logcritical(const char *str, ...)
{ {
va_list ap; va_list ap;
_log_setcolor(false,RED); _log_setcolor(false,RED);
if(logtime)
printf("%s ", GetTimeString().c_str());
va_start(ap, str); va_start(ap, str);
vfprintf( stderr, str, ap ); vfprintf( stderr, str, ap );
va_end(ap); va_end(ap);
@ -181,6 +198,8 @@ void logcustom(uint8 lvl, Color color, const char *str, ...)
return; return;
va_list ap; va_list ap;
_log_setcolor(true,color); _log_setcolor(true,color);
if(logtime)
printf("%s ", GetTimeString().c_str());
va_start(ap, str); va_start(ap, str);
vprintf( str, ap ); vprintf( str, ap );
va_end(ap); va_end(ap);

View File

@ -22,6 +22,7 @@ enum Color
void log_prepare(char *fn, char *mode); void log_prepare(char *fn, char *mode);
void log_setloglevel(uint8 lvl); void log_setloglevel(uint8 lvl);
void log_setlogtime(bool b);
void log(const char *str, ...); void log(const char *str, ...);
void logdetail(const char *str, ...); void logdetail(const char *str, ...);
void logdebug(const char *str, ...); void logdebug(const char *str, ...);