mirror of https://github.com/aria2/aria2
Logger: Simplified console output and change level format in log
The date and time are now removed from console output. The log level is now formatted as "[LEVEL]".pull/36/head
parent
2364f809c3
commit
9a5fff0de0
|
@ -126,10 +126,16 @@ void writeHeader
|
||||||
size_t dateLength =
|
size_t dateLength =
|
||||||
strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", &tm);
|
strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", &tm);
|
||||||
assert(dateLength <= (size_t)20);
|
assert(dateLength <= (size_t)20);
|
||||||
fp.printf("%s.%06ld %s - ", datestr, tv.tv_usec, levelToString(level));
|
fp.printf("%s.%06ld [%s] [%s:%d] ", datestr, tv.tv_usec, levelToString(level),
|
||||||
if(sourceFile) {
|
sourceFile, lineNum);
|
||||||
fp.printf("[%s:%d]", sourceFile, lineNum);
|
}
|
||||||
}
|
} // namespace
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
template<typename Output>
|
||||||
|
void writeHeaderConsole(Output& fp, Logger::LEVEL level)
|
||||||
|
{
|
||||||
|
fp.printf("[%s] ", levelToString(level));
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
@ -158,7 +164,7 @@ void Logger::writeLog
|
||||||
}
|
}
|
||||||
if(toConsole) {
|
if(toConsole) {
|
||||||
global::cout()->printf("\n");
|
global::cout()->printf("\n");
|
||||||
writeHeader(*global::cout(), level, 0, 0);
|
writeHeaderConsole(*global::cout(), level);
|
||||||
global::cout()->printf("%s\n", msg);
|
global::cout()->printf("%s\n", msg);
|
||||||
writeStackTrace(*global::cout(), trace);
|
writeStackTrace(*global::cout(), trace);
|
||||||
global::cout()->flush();
|
global::cout()->flush();
|
||||||
|
|
Loading…
Reference in New Issue