summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Gavant <josh.gavant@outlook.com>2017-04-05 10:49:46 -0700
committerJosh Gavant <josh.gavant@outlook.com>2017-05-04 07:58:32 -0700
commit6ade7f360184da4ea63c8ad1b6a24dc4a2bf9655 (patch)
tree93197b64306d712879a4e198cdad2409bb10c108
parente48d58b8b26bd6f1a59cfb57307906b9b0350272 (diff)
downloadnode-new-6ade7f360184da4ea63c8ad1b6a24dc4a2bf9655.tar.gz
src: update --inspect hint text
* Removes "experimental" warning. * Prints ws://_ip_:_port_:/_uuid_ for all IDs. * Refers to nodejs.org guide for more details. PR-URL: https://github.com/nodejs/node/pull/11207 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <mhdawson@ibm.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
-rw-r--r--src/inspector_socket_server.cc13
-rw-r--r--test/inspector/inspector-helper.js4
2 files changed, 5 insertions, 12 deletions
diff --git a/src/inspector_socket_server.cc b/src/inspector_socket_server.cc
index 1555e45dd6..1b1cf731e6 100644
--- a/src/inspector_socket_server.cc
+++ b/src/inspector_socket_server.cc
@@ -81,19 +81,12 @@ void PrintDebuggerReadyMessage(const std::string& host,
if (out == NULL) {
return;
}
- fprintf(out,
- "Debugger listening on %s:%d.\n",
- host.c_str(), port);
- if (ids.size() == 1)
- fprintf(out, "To start debugging, open the following URL in Chrome:\n");
- if (ids.size() > 1)
- fprintf(out, "To start debugging, open the following URLs in Chrome:\n");
for (const std::string& id : ids) {
- fprintf(out,
- " chrome-devtools://devtools/bundled/inspector.html?"
- "experiments=true&v8only=true&ws=%s\n",
+ fprintf(out, "Debugger listening on ws://%s\n",
GetWsUrl(host, port, id).c_str());
}
+ fprintf(out, "For help see %s\n",
+ "https://nodejs.org/en/docs/inspector");
fflush(out);
}
diff --git a/test/inspector/inspector-helper.js b/test/inspector/inspector-helper.js
index 2fb6a0e999..1f58287068 100644
--- a/test/inspector/inspector-helper.js
+++ b/test/inspector/inspector-helper.js
@@ -461,11 +461,11 @@ exports.startNodeForInspectorTest = function(callback,
clearTimeout(timeoutId);
console.log('[err]', text);
if (found) return;
- const match = text.match(/Debugger listening on .*:(\d+)/);
+ const match = text.match(/Debugger listening on ws:\/\/(.+):(\d+)\/(.+)/);
found = true;
child.stderr.removeListener('data', dataCallback);
assert.ok(match, text);
- callback(new Harness(match[1], child));
+ callback(new Harness(match[2], child));
});
child.stderr.on('data', dataCallback);