Skip to content

Commit

Permalink
src: add get/set pair for env context awareness
Browse files Browse the repository at this point in the history
PR-URL: #35024
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
codebytere authored and addaleax committed Sep 22, 2020
1 parent 00e020b commit 5eb1c9c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
8 changes: 8 additions & 0 deletions src/env-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,14 @@ inline bool Environment::abort_on_uncaught_exception() const {
return options_->abort_on_uncaught_exception;
}

inline void Environment::set_force_context_aware(bool value) {
options_->force_context_aware = value;
}

inline bool Environment::force_context_aware() const {
return options_->force_context_aware;
}

inline void Environment::set_abort_on_uncaught_exception(bool value) {
options_->abort_on_uncaught_exception = value;
}
Expand Down
3 changes: 3 additions & 0 deletions src/env.h
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,9 @@ class Environment : public MemoryRetainer {
void PrintSyncTrace() const;
inline void set_trace_sync_io(bool value);

inline void set_force_context_aware(bool value);
inline bool force_context_aware() const;

// This stores whether the --abort-on-uncaught-exception flag was passed
// to Node.
inline bool abort_on_uncaught_exception() const;
Expand Down
2 changes: 1 addition & 1 deletion src/node_binding.cc
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {

if (mp != nullptr) {
if (mp->nm_context_register_func == nullptr) {
if (env->options()->force_context_aware) {
if (env->force_context_aware()) {
dlib->Close();
THROW_ERR_NON_CONTEXT_AWARE_DISABLED(env);
return false;
Expand Down

0 comments on commit 5eb1c9c

Please sign in to comment.