From c1737e5c16cfc1a66a5ff354104e29647c7e867b Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 20 Apr 2015 15:12:46 +0800 Subject: [PATCH] Parse the debug args of Node --- atom/common/node_bindings.cc | 6 ++++++ vendor/node | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc index 4a0292e2b51d..10ab8f4929a4 100644 --- a/atom/common/node_bindings.cc +++ b/atom/common/node_bindings.cc @@ -128,6 +128,11 @@ void NodeBindings::Initialize() { node::g_standalone_mode = is_browser_; node::g_upstream_node_mode = false; + // Parse the debug args. + auto args = AtomCommandLine::argv(); + for (const std::string& arg : args) + node::ParseDebugOpt(arg.c_str()); + // Init node. // (we assume node::Init would not modify the parameters under embedded mode). node::Init(nullptr, nullptr, nullptr, nullptr); @@ -165,6 +170,7 @@ node::Environment* NodeBindings::CreateEnvironment( } void NodeBindings::LoadEnvironment(node::Environment* env) { + node::node_isolate = env->isolate(); if (node::use_debug_agent) node::StartDebug(env, node::debug_wait_connect); diff --git a/vendor/node b/vendor/node index a17c44028101..a7e75da3cae4 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit a17c44028101d80605556f047a844b3e7ab95677 +Subproject commit a7e75da3cae48cf6e55fa7c9f13d689f11021795