mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: ensure the inspector agent is shutdown before cleaning up the node env (#18028)

Browse source 
* fix: ensure the inspector agent is shutdown before cleaning up the node env

* spec: add tests to ensure clean shutdown with connected inspector agent

* Update node_debugger.cc
This commit is contained in:
Samuel Attard 2019-04-30 15:44:40 -07:00 • committed by GitHub
parent 4e5a0946c7
commit 67b3fbca89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/atom_browser_main_parts.cc
View file

@ -452,6 +452,7 @@ void AtomBrowserMainParts::PostMainMessageLoopRun() {
ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler);
#endif
node_debugger_->Stop();
js_env_->OnMessageLoopDestroying();
#if defined(OS_MACOSX)

6
atom/browser/node_debugger.cc
View file

@ -58,4 +58,10 @@ void NodeDebugger::Start() {
DCHECK(env_->inspector_agent()->IsListening());
}
void NodeDebugger::Stop() {
auto* inspector = env_->inspector_agent();
if (inspector && inspector->IsListening())
inspector->Stop();
}
} // namespace atom

1
atom/browser/node_debugger.h
View file

@ -20,6 +20,7 @@ class NodeDebugger {
~NodeDebugger();
void Start();
void Stop();
private:
node::Environment* env_;