From d8a399f97ee2b612cf7aa11d2f01662330b05a0a Mon Sep 17 00:00:00 2001 From: huw Date: Sun, 26 Nov 2023 11:19:10 +0000 Subject: [PATCH 1/3] Add `took recursive isolate lock` warning to workerd output exceptions --- packages/wrangler/src/dev/miniflare.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/wrangler/src/dev/miniflare.ts b/packages/wrangler/src/dev/miniflare.ts index 8924ed51e6e6..7a4d780f307a 100644 --- a/packages/wrangler/src/dev/miniflare.ts +++ b/packages/wrangler/src/dev/miniflare.ts @@ -410,12 +410,15 @@ export function handleRuntimeStdio(stdout: Readable, stderr: Readable) { const containsLlvmSymbolizerWarning = chunk.includes( "Not symbolizing stack traces because $LLVM_SYMBOLIZER is not set" ); + const containsRecursiveIsolateLockWarning = chunk.includes( + "took recursive isolate lock" + ) // Matches stack traces from workerd // - on unix: groups of 9 hex digits separated by spaces // - on windows: groups of 12 hex digits, or a single digit 0, separated by spaces const containsHexStack = /stack:( (0|[a-f\d]{4,})){3,}/.test(chunk); - return containsLlvmSymbolizerWarning || containsHexStack; + return containsLlvmSymbolizerWarning || containsRecursiveIsolateLockWarning || containsHexStack; }, // Is this chunk an Address In Use error? isAddressInUse(chunk: string) { From 444bfcd40fc990cc4224ed0b3602177673fe22d5 Mon Sep 17 00:00:00 2001 From: huw Date: Sun, 26 Nov 2023 11:26:11 +0000 Subject: [PATCH 2/3] Add changeset --- .changeset/hot-mirrors-shake.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/hot-mirrors-shake.md diff --git a/.changeset/hot-mirrors-shake.md b/.changeset/hot-mirrors-shake.md new file mode 100644 index 000000000000..636fe4290ff5 --- /dev/null +++ b/.changeset/hot-mirrors-shake.md @@ -0,0 +1,5 @@ +--- +"wrangler": patch +--- + +Add 'took recursive isolate lock' warning to workerd output exceptions From 3dc641c078d2b3c114994987459ff133494efd70 Mon Sep 17 00:00:00 2001 From: huw Date: Tue, 12 Dec 2023 02:31:35 +0000 Subject: [PATCH 3/3] Prettify changed file --- packages/wrangler/src/dev/miniflare.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/wrangler/src/dev/miniflare.ts b/packages/wrangler/src/dev/miniflare.ts index 8aa9696242ff..96ea16562ba2 100644 --- a/packages/wrangler/src/dev/miniflare.ts +++ b/packages/wrangler/src/dev/miniflare.ts @@ -417,13 +417,17 @@ export function handleRuntimeStdio(stdout: Readable, stderr: Readable) { ); const containsRecursiveIsolateLockWarning = chunk.includes( "took recursive isolate lock" - ) + ); // Matches stack traces from workerd // - on unix: groups of 9 hex digits separated by spaces // - on windows: groups of 12 hex digits, or a single digit 0, separated by spaces const containsHexStack = /stack:( (0|[a-f\d]{4,})){3,}/.test(chunk); - return containsLlvmSymbolizerWarning || containsRecursiveIsolateLockWarning || containsHexStack; + return ( + containsLlvmSymbolizerWarning || + containsRecursiveIsolateLockWarning || + containsHexStack + ); }, // Is this chunk an Address In Use error? isAddressInUse(chunk: string) {