diff options
| author | Anna Henningsen <anna@addaleax.net> | 2019-11-02 21:11:40 +0100 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2019-11-06 23:26:06 +0100 |
| commit | d4b2cc7ead4ffdbe8091c7cb0e6a621be712a79b (patch) | |
| tree | 8200d838fcdb8bebd41e38a878f155bb1316c0da | |
| parent | 86cdfc60a9ae21f64058e7292db3566d91d09085 (diff) | |
| download | android-node-v8-d4b2cc7ead4ffdbe8091c7cb0e6a621be712a79b.tar.gz android-node-v8-d4b2cc7ead4ffdbe8091c7cb0e6a621be712a79b.tar.bz2 android-node-v8-d4b2cc7ead4ffdbe8091c7cb0e6a621be712a79b.zip | |
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: https://github.com/nodejs/node/pull/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>
| -rw-r--r-- | src/api/hooks.cc | 2 | ||||
| -rw-r--r-- | src/node_main_instance.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/api/hooks.cc b/src/api/hooks.cc index cec58cee00..2dd0cc994e 100644 --- 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 index a4b2853b7c..eea8477253 100644 --- 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()); } |