src: run RunBeforeExitCallbacks as part of EmitBeforeExit

This is part of a series of changes to make embedding easier, by requiring fewer internal methods to build a fully functioning Node.js instance. This also aligns the worker_threads code with the main thread code. PR-URL: #30229 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com>
nodejs · Nov 17, 2019 · 906d279e697af654cb731d3ca9079bb3c52080e7 · 906d279
1 parent 66b3619
commit 906d279e697af654cb731d3ca9079bb3c52080e7
Showing with 2 additions and 2 deletions.

+2 −0 src/api/hooks.cc

+0 −2 src/node_main_instance.cc
diff --git a/src/api/hooks.cc b/src/api/hooks.cc
@@ -30,6 +30,8 @@ void AtExit(Environment* env, void (*cb)(void* arg), void* arg) {
 }
 
 void EmitBeforeExit(Environment* env) {
+  env->RunBeforeExitCallbacks();
+
   HandleScope handle_scope(env->isolate());
   Context::Scope context_scope(env->context());
   Local<Value> exit_code = env->process_object()

diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc
@@ -140,8 +140,6 @@ int NodeMainInstance::Run() {
         more = uv_loop_alive(env->event_loop());
         if (more && !env->is_stopping()) continue;
 
-        env->RunBeforeExitCallbacks();
-
         if (!uv_loop_alive(env->event_loop())) {
           EmitBeforeExit(env.get());
         }