Skip to content

Commit 69cc26a

Browse files
jasnelltargos
authored andcommitted
src: cleanup beforeExit for consistency
PR-URL: #21113 Reviewed-By: Anna Henningsen <[email protected]>
1 parent 1673568 commit 69cc26a

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/env.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ struct PackageConfig {
160160
V(env_pairs_string, "envPairs") \
161161
V(errno_string, "errno") \
162162
V(error_string, "error") \
163-
V(exiting_string, "_exiting") \
164163
V(exit_code_string, "exitCode") \
165-
V(exit_string, "exit") \
166164
V(expire_string, "expire") \
167165
V(exponent_string, "exponent") \
168166
V(exports_string, "exports") \

src/node.cc

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4135,10 +4135,11 @@ void EmitBeforeExit(Environment* env) {
41354135
HandleScope handle_scope(env->isolate());
41364136
Context::Scope context_scope(env->context());
41374137
Local<Object> process_object = env->process_object();
4138-
Local<String> exit_code = FIXED_ONE_BYTE_STRING(env->isolate(), "exitCode");
4138+
Local<String> exit_code = env->exit_code_string();
41394139
Local<Value> args[] = {
41404140
FIXED_ONE_BYTE_STRING(env->isolate(), "beforeExit"),
4141-
process_object->Get(exit_code)->ToInteger(env->context()).ToLocalChecked()
4141+
process_object->Get(env->context(), exit_code).ToLocalChecked()
4142+
->ToInteger(env->context()).ToLocalChecked()
41424143
};
41434144
MakeCallback(env->isolate(),
41444145
process_object, "emit", arraysize(args), args,
@@ -4151,13 +4152,15 @@ int EmitExit(Environment* env) {
41514152
HandleScope handle_scope(env->isolate());
41524153
Context::Scope context_scope(env->context());
41534154
Local<Object> process_object = env->process_object();
4154-
process_object->Set(env->exiting_string(), True(env->isolate()));
4155+
process_object->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "_exiting"),
4156+
True(env->isolate()));
41554157

4156-
Local<String> exitCode = env->exit_code_string();
4157-
int code = process_object->Get(exitCode)->Int32Value();
4158+
Local<String> exit_code = env->exit_code_string();
4159+
int code = process_object->Get(env->context(), exit_code).ToLocalChecked()
4160+
->Int32Value(env->context()).ToChecked();
41584161

41594162
Local<Value> args[] = {
4160-
env->exit_string(),
4163+
FIXED_ONE_BYTE_STRING(env->isolate(), "exit"),
41614164
Integer::New(env->isolate(), code)
41624165
};
41634166

@@ -4166,7 +4169,8 @@ int EmitExit(Environment* env) {
41664169
{0, 0}).ToLocalChecked();
41674170

41684171
// Reload exit code, it may be changed by `emit('exit')`
4169-
return process_object->Get(exitCode)->Int32Value();
4172+
return process_object->Get(env->context(), exit_code).ToLocalChecked()
4173+
->Int32Value(env->context()).ToChecked();
41704174
}
41714175

41724176

0 commit comments

Comments
 (0)