From 8e790ca322d191aeef9368bcae5d3c006da58c8c Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Wed, 15 Apr 2015 17:15:45 +0200
Subject: [PATCH] log environment ID and threadName if in scope

---
 src/node_log.cpp | 20 ++++++++++++++++++--
 vendor/mbgl      |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/node_log.cpp b/src/node_log.cpp
index 16cfdbdf4..1418158d1 100644
--- a/src/node_log.cpp
+++ b/src/node_log.cpp
@@ -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;
 }
 
diff --git a/vendor/mbgl b/vendor/mbgl
index 88b8d452b..5972a7d16 160000
--- a/vendor/mbgl
+++ b/vendor/mbgl
@@ -1 +1 @@
-Subproject commit 88b8d452b9ed2cc6c156b6b446904b86afd3c7a2
+Subproject commit 5972a7d16e6988a856daeafd14c6751332f22bf5