@@ -12,9 +12,9 @@ struct NodeLogObserver::LogMessage {
|
||||
|
||||
LogMessage(mbgl::EventSeverity severity_, mbgl::Event event_, int64_t code_, std::string text_)
|
||||
: severity(severity_),
|
||||
event(event_),
|
||||
code(code_),
|
||||
text(std::move(text_)) {}
|
||||
event(event_),
|
||||
code(code_),
|
||||
text(std::move(text_)) {}
|
||||
};
|
||||
|
||||
NodeLogObserver::NodeLogObserver(v8::Local<v8::Object> target)
|
||||
@@ -23,25 +23,26 @@ NodeLogObserver::NodeLogObserver(v8::Local<v8::Object> target)
|
||||
|
||||
auto msg = Nan::New<v8::Object>();
|
||||
|
||||
Nan::Set(msg, Nan::New("class").ToLocalChecked(),
|
||||
Nan::New(mbgl::Enum<mbgl::Event>::toString(message.event)).ToLocalChecked());
|
||||
Nan::Set(msg,
|
||||
Nan::New("class").ToLocalChecked(),
|
||||
Nan::New(mbgl::Enum<mbgl::Event>::toString(message.event)).ToLocalChecked());
|
||||
|
||||
Nan::Set(msg, Nan::New("severity").ToLocalChecked(),
|
||||
Nan::New(mbgl::Enum<mbgl::EventSeverity>::toString(message.severity)).ToLocalChecked());
|
||||
Nan::Set(msg,
|
||||
Nan::New("severity").ToLocalChecked(),
|
||||
Nan::New(mbgl::Enum<mbgl::EventSeverity>::toString(message.severity)).ToLocalChecked());
|
||||
|
||||
if (message.code != -1) {
|
||||
Nan::Set(msg, Nan::New("code").ToLocalChecked(),
|
||||
Nan::New<v8::Number>(message.code));
|
||||
Nan::Set(msg, Nan::New("code").ToLocalChecked(), Nan::New<v8::Number>(message.code));
|
||||
}
|
||||
|
||||
if (!message.text.empty()) {
|
||||
Nan::Set(msg, Nan::New("text").ToLocalChecked(),
|
||||
Nan::New(message.text).ToLocalChecked());
|
||||
Nan::Set(msg, Nan::New("text").ToLocalChecked(), Nan::New(message.text).ToLocalChecked());
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> argv[] = { Nan::New("message").ToLocalChecked(), msg };
|
||||
v8::Local<v8::Value> argv[] = {Nan::New("message").ToLocalChecked(), msg};
|
||||
auto handle = Nan::New<v8::Object>(module);
|
||||
auto emit = Nan::To<v8::Object>(Nan::Get(handle, Nan::New("emit").ToLocalChecked()).ToLocalChecked()).ToLocalChecked();
|
||||
auto emit = Nan::To<v8::Object>(Nan::Get(handle, Nan::New("emit").ToLocalChecked()).ToLocalChecked())
|
||||
.ToLocalChecked();
|
||||
Nan::CallAsFunction(emit, handle, 2, argv);
|
||||
})) {
|
||||
Nan::HandleScope scope;
|
||||
@@ -56,7 +57,7 @@ NodeLogObserver::~NodeLogObserver() {
|
||||
}
|
||||
|
||||
bool NodeLogObserver::onRecord(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string &text) {
|
||||
queue->send({ severity, event, code, text });
|
||||
queue->send({severity, event, code, text});
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user