From d41d2c63dd9a37576376a4a6d8a4fc4a5ac5f63b Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Thu, 25 Jun 2015 18:23:28 +0300
Subject: [PATCH] Remove mbgl::Environment from logging

mbgl::Environment was dropped and since most of the errors are being
forwarded to the NodeMap render callback, we can handle them there
and pinpoint exactly what NodeMap object is failing.
---
 src/node_log.cpp | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/node_log.cpp b/src/node_log.cpp
index d7cf0e0d8..637534807 100644
--- a/src/node_log.cpp
+++ b/src/node_log.cpp
@@ -1,8 +1,6 @@
 #include "node_log.hpp"
 #include "util/async_queue.hpp"
 
-#include <mbgl/map/environment.hpp>
-
 namespace node_mbgl {
 
 struct NodeLogObserver::LogMessage {
@@ -10,16 +8,6 @@ struct NodeLogObserver::LogMessage {
     mbgl::Event event;
     int64_t code;
     std::string text;
-    int environment = -1;
-    std::string threadName = "";
-
-    LogMessage(mbgl::EventSeverity severity_, mbgl::Event event_, int64_t code_, std::string text_, int environment_, std::string threadName_)
-        : severity(severity_),
-        event(event_),
-        code(code_),
-        text(text_),
-        environment(environment_),
-        threadName(threadName_) {};
 
     LogMessage(mbgl::EventSeverity severity_, mbgl::Event event_, int64_t code_, std::string text_)
         : severity(severity_),
@@ -41,12 +29,6 @@ NodeLogObserver::NodeLogObserver(v8::Handle<v8::Object> target)
           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 handle = NanNew<v8::Object>(module);
@@ -65,13 +47,7 @@ NodeLogObserver::~NodeLogObserver() {
 }
 
 bool NodeLogObserver::onRecord(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string &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 });
-    }
+    queue->send({ severity, event, code, text });
     return true;
 }