Nodejs/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 10:59:27 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

debugger: indicate server is ending

Browse Source 
Currently, we say "listening" when we are ending the server. Change it
to "ending".

Fixes: https://github.com/nodejs/node/issues/39272

PR-URL: https://github.com/nodejs/node/pull/39334
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yash Ladha <yash@yashladha.in>
This commit is contained in:
Rich Trott 2021-07-09 18:19:41 -07:00
parent 09d8c0c8d2
commit a518e4b871
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/inspector_socket_server.cc
View File

@ -234,6 +234,7 @@ void PrintDebuggerReadyMessage(
const std::string& host,
const std::vector<InspectorSocketServer::ServerSocketPtr>& server_sockets,
const std::vector<std::string>& ids,
const char* verb,
bool publish_uid_stderr,
FILE* out) {
if (!publish_uid_stderr || out == nullptr) {
@ -241,7 +242,8 @@ void PrintDebuggerReadyMessage(
}
for (const auto& server_socket : server_sockets) {
for (const std::string& id : ids) {
fprintf(out, "Debugger listening on %s\n",
fprintf(out, "Debugger %s on %s\n",
verb,
FormatWsAddress(host, server_socket->port(), id, true).c_str());
}
}
@ -300,6 +302,7 @@ void InspectorSocketServer::SessionTerminated(int session_id) {
PrintDebuggerReadyMessage(host_,
server_sockets_,
delegate_->GetTargetIds(),
"ending",
inspect_publish_uid_.console,
out_);
}
@ -425,6 +428,7 @@ bool InspectorSocketServer::Start() {
PrintDebuggerReadyMessage(host_,
server_sockets_,
delegate_->GetTargetIds(),
"listening",
inspect_publish_uid_.console,
out_);
return true;

24
test/known_issues/test-debugger-restart-message.js → test/sequential/test-debugger-restart-message.js
View File

@ -1,30 +1,12 @@
'use strict';
// Refs: https://github.com/nodejs/node/issues/39272
const common = require('../common');
common.skipIfInspectorDisabled();
const assert = require('assert');
// When this is moved out of known_issues, this skip can be removed.
if (common.isOSX) {
assert.fail('does not fail reliably on macOS in CI');
}
// When this is moved out of known_issues, this can be removed and replaced with
// the commented-out use of common.skipIfInspectorDisabled() below.
if (!process.features.inspector) {
assert.fail('Known issues test should fail, so if the inspector is disabled');
}
// Will need to uncomment this when moved out of known_issues.
// common.skipIfInspectorDisabled();
// This can be reduced to 2 or even 1 (and the loop removed) once the debugger
// is fixed. It's set higher to make sure that the error is tripped reliably
// in CI. On most systems, the error will be tripped on the first test, but
// on a few platforms in CI, it needs to be many times.
const RESTARTS = 16;
const RESTARTS = 10;
const fixtures = require('../common/fixtures');
const startCLI = require('../common/debugger');