tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log environment ID and threadName if in scope

Browse Source
This commit is contained in:
Mike Morris
2015-04-15 17:15:45 +02:00
parent 8671015119
commit 8e790ca322
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/node_log.cpp
View File

@@ -1,5 +1,7 @@
#include "node_log.hpp"
#include <mbgl/map/environment.hpp>
namespace node_mbgl {
struct NodeLogObserver::LogMessage {
@@ -7,6 +9,8 @@ struct NodeLogObserver::LogMessage {
mbgl::Event event;
int64_t code;
std::string text;
int environment;
std::string threadName;
};
NodeLogObserver::NodeLogObserver(v8::Handle<v8::Object> target)
@@ -17,11 +21,17 @@ NodeLogObserver::NodeLogObserver(v8::Handle<v8::Object> target)
msg->Set(NanNew("class"), NanNew(mbgl::EventClass(message.event).c_str()));
msg->Set(NanNew("severity"), NanNew(mbgl::EventSeverityClass(message.severity).c_str()));
if (message.code != -1) {
msg->Set(NanNew("code"), NanNew(double(message.code)));
msg->Set(NanNew("code"), NanNew<v8::Number>(message.code));
}
if (!message.text.empty()) {
msg->Set(NanNew("text"), NanNew(message.text));
}
if (message.environment != -1) {
msg->Set(NanNew("environment"), NanNew<v8::Number>(message.environment));
}
if (!message.threadName.empty()) {
msg->Set(NanNew("threadName"), NanNew(message.threadName));
}
v8::Local<v8::Value> argv[] = { NanNew("message"), msg };
auto emit = module->Get(NanNew("emit"))->ToObject();
@@ -39,7 +49,13 @@ NodeLogObserver::~NodeLogObserver() {
}
bool NodeLogObserver::onRecord(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string &text) {
queue->send({ severity, event, code, text });
if (mbgl::Environment::inScope()) {
int env = static_cast<int>(mbgl::Environment::Get().getID());
std::string threadName = mbgl::Environment::threadName();
queue->send({ severity, event, code, text, env, threadName });
} else {
queue->send({ severity, event, code, text, -1, "" });
}
return true;
}