Skip to content

Commit

Permalink
inspector: change default port
Browse files Browse the repository at this point in the history
We should use a different default port number for the new debug
protocol. This makes it easier for debuggers to guess which protocol
they are expected to use to talk to a node process with a debug
server.

PR-URL: nodejs#7212
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: cjihrig - Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
ofrobots committed Jun 9, 2016
1 parent 853b845 commit a766ebf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/inspector_agent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class V8NodeInspector : public blink::V8Inspector {
bool running_nested_loop_;
};

Agent::Agent(Environment* env) : port_(9229),
Agent::Agent(Environment* env) : port_(0),
wait_(false),
connected_(false),
shutting_down_(false),
Expand Down
23 changes: 14 additions & 9 deletions src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ static bool use_inspector = false;
static bool use_debug_agent = false;
static bool debug_wait_connect = false;
static int debug_port = 5858;
static int inspector_port = 9229;
static const int v8_default_thread_pool_size = 4;
static int v8_thread_pool_size = v8_default_thread_pool_size;
static bool prof_process = false;
Expand Down Expand Up @@ -3351,12 +3352,17 @@ static bool ParseDebugOpt(const char* arg) {
}

if (port != nullptr) {
debug_port = atoi(port);
if (debug_port < 1024 || debug_port > 65535) {
int port_int = atoi(port);
if (port_int < 1024 || port_int > 65535) {
fprintf(stderr, "Debug port must be in range 1024 to 65535.\n");
PrintHelp();
exit(12);
}
if (use_inspector) {
inspector_port = port_int;
} else {
debug_port = port_int;
}
}

return true;
Expand Down Expand Up @@ -3618,22 +3624,21 @@ static void StartDebug(Environment* env, bool wait) {
CHECK(!debugger_running);
#if HAVE_INSPECTOR
if (use_inspector) {
env->inspector_agent()->Start(default_platform, debug_port, wait);
env->inspector_agent()->Start(default_platform, inspector_port, wait);
debugger_running = true;
} else {
#endif
env->debugger_agent()->set_dispatch_handler(
DispatchMessagesDebugAgentCallback);
debugger_running = env->debugger_agent()->Start(debug_port, wait);
if (debugger_running == false) {
fprintf(stderr, "Starting debugger on port %d failed\n", debug_port);
fflush(stderr);
return;
}
#if HAVE_INSPECTOR
}
#endif

if (debugger_running == false) {
fprintf(stderr, "Starting debugger on port %d failed\n", debug_port);
fflush(stderr);
return;
}
}


Expand Down

0 comments on commit a766ebf

Please sign in to comment.