fixup! src: fix Worker termination when '--inspect-brk' is passed

Signed-off-by: Daeyeon Jeong <daeyeon.dev@gmail.com>
nodejs · Jul 5, 2024 · 8cdeef5 · 8cdeef5
1 parent 264d531
commit 8cdeef5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/env.h b/src/env.h
@@ -629,7 +629,7 @@ class Environment : public MemoryRetainer {
   // the ownership if transferred into the Environment.
   void InitializeInspector(
       std::unique_ptr<inspector::ParentInspectorHandle> parent_handle);
-  void WaitForInspectorFrontend();
+  void WaitForInspectorFrontendByOptions();
 #endif
 
   inline size_t async_callback_scope_depth() const;

diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
@@ -1051,8 +1051,9 @@ bool Agent::WaitForConnectByOptions() {
       parent_env_->options()->get_debug_options()->EnableBreakFirstLine();
     }
     client_->waitForFrontend();
+    return true;
   }
-  return true;
+  return false;
 }
 
 void Agent::StopIfWaitingForConnect() {

diff --git a/src/node.cc b/src/node.cc
@@ -206,13 +206,13 @@ void Environment::InitializeInspector(
   }
 
   if (should_wait_for_inspector_frontend()) {
-    WaitForInspectorFrontend();
+    WaitForInspectorFrontendByOptions();
   }
 
   profiler::StartProfilers(this);
 }
 
-void Environment::WaitForInspectorFrontend() {
+void Environment::WaitForInspectorFrontendByOptions() {
   if (!inspector_agent_->WaitForConnectByOptions()) {
     return;
   }

diff --git a/src/node_worker.cc b/src/node_worker.cc
@@ -385,7 +385,7 @@ void Worker::Run() {
       Debug(this, "Created Environment for worker with id %llu", thread_id_.id);
 
 #if HAVE_INSPECTOR
-      this->env_->WaitForInspectorFrontend();
+      this->env_->WaitForInspectorFrontendByOptions();
 #endif
       if (is_stopped()) return;
       {