|
|
|
@ -37,15 +37,28 @@ namespace llarp
|
|
|
|
|
LogLevel minlevel = eLogInfo;
|
|
|
|
|
std::ostream& out;
|
|
|
|
|
llarp::util::Mutex access;
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
bool isConsoleModern =
|
|
|
|
|
true; // qol fix so oldfag clients don't see ugly escapes
|
|
|
|
|
HANDLE fd1 = GetStdHandle(STD_OUTPUT_HANDLE);
|
|
|
|
|
CONSOLE_SCREEN_BUFFER_INFO consoleInfo;
|
|
|
|
|
short old_attrs;
|
|
|
|
|
#endif
|
|
|
|
|
Logger() : Logger(std::cout, "unnamed")
|
|
|
|
|
{
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
// Attempt to use ANSI escapes directly
|
|
|
|
|
// if the modern console is active.
|
|
|
|
|
DWORD mode_flags;
|
|
|
|
|
HANDLE fd1 = GetStdHandle(STD_OUTPUT_HANDLE);
|
|
|
|
|
|
|
|
|
|
GetConsoleMode(fd1, &mode_flags);
|
|
|
|
|
// since release SDKs don't have ANSI escape support yet
|
|
|
|
|
mode_flags |= 0x0004;
|
|
|
|
|
SetConsoleMode(fd1, mode_flags);
|
|
|
|
|
// we get all or nothing: if we can't get it, then we wouldn't
|
|
|
|
|
// be able to get any of them individually
|
|
|
|
|
mode_flags |= 0x0004 | 0x0008;
|
|
|
|
|
BOOL t = SetConsoleMode(fd1, mode_flags);
|
|
|
|
|
if(!t)
|
|
|
|
|
this->isConsoleModern = false; // fall back to setting colours manually
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -144,27 +157,68 @@ namespace llarp
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
switch(lvl)
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
if(_glog.isConsoleModern)
|
|
|
|
|
{
|
|
|
|
|
case eLogNone:
|
|
|
|
|
break;
|
|
|
|
|
case eLogDebug:
|
|
|
|
|
ss << (char)27 << "[0m";
|
|
|
|
|
ss << "[DBG] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogInfo:
|
|
|
|
|
ss << (char)27 << "[1m";
|
|
|
|
|
ss << "[NFO] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogWarn:
|
|
|
|
|
ss << (char)27 << "[1;33m";
|
|
|
|
|
ss << "[WRN] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogError:
|
|
|
|
|
ss << (char)27 << "[1;31m";
|
|
|
|
|
ss << "[ERR] ";
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
switch(lvl)
|
|
|
|
|
{
|
|
|
|
|
case eLogNone:
|
|
|
|
|
break;
|
|
|
|
|
case eLogDebug:
|
|
|
|
|
ss << (char)27 << "[0m";
|
|
|
|
|
ss << "[DBG] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogInfo:
|
|
|
|
|
ss << (char)27 << "[1m";
|
|
|
|
|
ss << "[NFO] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogWarn:
|
|
|
|
|
ss << (char)27 << "[1;33m";
|
|
|
|
|
ss << "[WRN] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogError:
|
|
|
|
|
ss << (char)27 << "[1;31m";
|
|
|
|
|
ss << "[ERR] ";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
}
|
|
|
|
|
else // legacy console
|
|
|
|
|
{
|
|
|
|
|
// these _should_ be low white on black
|
|
|
|
|
GetConsoleScreenBufferInfo(_glog.fd1, &_glog.consoleInfo);
|
|
|
|
|
_glog.old_attrs = _glog.consoleInfo.wAttributes;
|
|
|
|
|
switch(lvl)
|
|
|
|
|
{
|
|
|
|
|
case eLogNone:
|
|
|
|
|
break;
|
|
|
|
|
case eLogDebug:
|
|
|
|
|
SetConsoleTextAttribute(_glog.fd1,
|
|
|
|
|
FOREGROUND_RED | FOREGROUND_GREEN
|
|
|
|
|
| FOREGROUND_BLUE); // low white on black
|
|
|
|
|
ss << "[DBG] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogInfo:
|
|
|
|
|
SetConsoleTextAttribute(_glog.fd1,
|
|
|
|
|
FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN
|
|
|
|
|
| FOREGROUND_BLUE); // high white on black
|
|
|
|
|
ss << "[NFO] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogWarn:
|
|
|
|
|
SetConsoleTextAttribute(_glog.fd1,
|
|
|
|
|
FOREGROUND_RED | FOREGROUND_GREEN
|
|
|
|
|
| FOREGROUND_INTENSITY); // bright yellow
|
|
|
|
|
ss << "[WRN] ";
|
|
|
|
|
break;
|
|
|
|
|
case eLogError:
|
|
|
|
|
SetConsoleTextAttribute(
|
|
|
|
|
_glog.fd1, FOREGROUND_RED | FOREGROUND_INTENSITY); // bright red
|
|
|
|
|
ss << "[ERR] ";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
std::string tag = fname;
|
|
|
|
|
ss << _glog.nodeName << " (" << thread_id_string() << ") "
|
|
|
|
@ -172,8 +226,23 @@ namespace llarp
|
|
|
|
|
ss << "\t";
|
|
|
|
|
LogAppend(ss, std::forward< TArgs >(args)...);
|
|
|
|
|
#ifndef ANDROID
|
|
|
|
|
ss << (char)27 << "[0;0m";
|
|
|
|
|
_glog.out << ss.str() << std::endl;
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
if(_glog.isConsoleModern)
|
|
|
|
|
{
|
|
|
|
|
#endif
|
|
|
|
|
ss << (char)27 << "[0;0m";
|
|
|
|
|
glog.out << ss.str() << std::endl;
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
glog.out << ss.str() << std::endl;
|
|
|
|
|
SetConsoleTextAttribute(
|
|
|
|
|
_glog.fd1, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
_
|
|
|
|
|
#else
|
|
|
|
|
{
|
|
|
|
|
tag = "LOKINET|" + tag;
|
|
|
|
|