move node log from backend to observer pattern

back to gl-native master branch
This commit is contained in:
Mike Morris
2015-04-14 14:43:58 +02:00
parent 89e226e10f
commit 8671015119
5 changed files with 20 additions and 41 deletions

View File

@@ -1,29 +1,27 @@
#include "node_log.hpp"
#include <cstdarg>
namespace node_mbgl {
struct NodeLogBackend::Message {
struct NodeLogObserver::LogMessage {
mbgl::EventSeverity severity;
mbgl::Event event;
int64_t code;
std::string text;
};
NodeLogBackend::NodeLogBackend(v8::Handle<v8::Object> target)
: queue(new Queue(uv_default_loop(), [this](Message &message) {
NodeLogObserver::NodeLogObserver(v8::Handle<v8::Object> target)
: queue(new Queue(uv_default_loop(), [this](LogMessage &message) {
NanScope();
auto msg = v8::Object::New();
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)));
}
if (!message.text.empty()) {
msg->Set(NanNew("text"), NanNew(message.text));
}
if (message.code != 0) {
msg->Set(NanNew("code"), NanNew(double(message.code)));
}
v8::Local<v8::Value> argv[] = { NanNew("message"), msg };
auto emit = module->Get(NanNew("emit"))->ToObject();
@@ -36,29 +34,13 @@ NodeLogBackend::NodeLogBackend(v8::Handle<v8::Object> target)
queue->unref();
}
NodeLogBackend::~NodeLogBackend() {
NodeLogObserver::~NodeLogObserver() {
queue->stop();
}
void NodeLogBackend::record(mbgl::EventSeverity severity, mbgl::Event event, const std::string &msg) {
queue->send({ severity, event, 0, msg });
}
void NodeLogBackend::record(mbgl::EventSeverity severity, mbgl::Event event, const char* format, ...) {
char msg[512];
va_list args;
va_start(args, format);
vsnprintf(msg, 512, format, args);
va_end(args);
queue->send({ severity, event, 0, msg });
}
void NodeLogBackend::record(mbgl::EventSeverity severity, mbgl::Event event, int64_t code) {
queue->send({ severity, event, code, "" });
}
void NodeLogBackend::record(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string &msg) {
queue->send({ severity, event, code, msg });
bool NodeLogObserver::onRecord(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string &text) {
queue->send({ severity, event, code, text });
return true;
}
}