Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(node): reuseExisting does not need to call bind on domain #7780

Merged
merged 6 commits into from
Apr 7, 2023
+16 −1
Merged

fix(node): reuseExisting does not need to call bind on domain #7780

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e80c7f
feat(core): Extend `AsyncContextStrategy` to allow reuse of existing …
timfish Apr 6, 2023
99d3bfa
More jsdocs
timfish Apr 6, 2023
b5cb908
Use an options object for more non-breaking flexibility in the future
timfish Apr 6, 2023
b5c8d18
Add tests for reuseExisting
timfish Apr 6, 2023
bd5ab66
Don't create a domain if reuse is requested
timfish Apr 6, 2023
84ff554
Merge remote-tracking branch 'upstream/develop' into feat/reuse-async…
timfish Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion packages/node/src/async/domain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,22 @@ function getCurrentHub(): Hub | undefined {
}

function runWithAsyncContext<T>(callback: (hub: Hub) => T, options: RunWithAsyncContextOptions): T {
const local = options?.reuseExisting ? getActiveDomain<domain.Domain>() || domain.create() : domain.create();
if (options?.reuseExisting) {
const activeDomain = getActiveDomain<domain.Domain & Carrier>();

if (activeDomain) {
for (const emitter of options.args || []) {
if (emitter instanceof EventEmitter) {
activeDomain.add(emitter);
}
}

// We're already in a domain, so we don't need to create a new one, just call the callback with the current hub
return callback(getHubFromCarrier(activeDomain));
}
}

const local = domain.create();

for (const emitter of options.args || []) {
if (emitter instanceof EventEmitter) {
Expand Down