|
|
@ -79,6 +79,23 @@ namespace llarp
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
std::stringstream ss;
|
|
|
|
std::stringstream ss;
|
|
|
|
|
|
|
|
#ifdef ANDROID
|
|
|
|
|
|
|
|
switch(lvl)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
case eLogDebug:
|
|
|
|
|
|
|
|
ss << "[DBG] ";
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case eLogInfo:
|
|
|
|
|
|
|
|
ss << "[NFO] ";
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case eLogWarn:
|
|
|
|
|
|
|
|
ss << "[WRN] ";
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case eLogError:
|
|
|
|
|
|
|
|
ss << "[ERR] ";
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
switch(lvl)
|
|
|
|
switch(lvl)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
case eLogDebug:
|
|
|
|
case eLogDebug:
|
|
|
@ -98,12 +115,15 @@ namespace llarp
|
|
|
|
ss << "[ERR] ";
|
|
|
|
ss << "[ERR] ";
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
std::string tag = fname;
|
|
|
|
std::string tag = fname;
|
|
|
|
ss << _glog.nodeName << " " << llarp_time_now_ms() << " " << tag << ":"
|
|
|
|
ss << _glog.nodeName << " " << llarp_time_now_ms() << " " << tag << ":"
|
|
|
|
<< lineno;
|
|
|
|
<< lineno;
|
|
|
|
ss << "\t";
|
|
|
|
ss << "\t";
|
|
|
|
LogAppend(ss, std::forward< TArgs >(args)...);
|
|
|
|
LogAppend(ss, std::forward< TArgs >(args)...);
|
|
|
|
|
|
|
|
#ifndef ANDROID
|
|
|
|
ss << (char)27 << "[0;0m";
|
|
|
|
ss << (char)27 << "[0;0m";
|
|
|
|
|
|
|
|
#else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
std::unique_lock< std::mutex > lock(_glog.access);
|
|
|
|
std::unique_lock< std::mutex > lock(_glog.access);
|
|
|
|
#ifdef ANDROID
|
|
|
|
#ifdef ANDROID
|
|
|
|