cleanup containers directly instead of using process.exit hook (#10986)

emily-shen · web-flow · commit 43503c764fb5 · 2025-10-15T15:41:07.000+01:00
* also cleanup containers directly in the teardown hook

* remove unnecessary call in multiworker runtime controller
diff --git a/.changeset/free-wombats-invent.md b/.changeset/free-wombats-invent.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+fix: cleanup any running containers again on wrangler dev exit
diff --git a/fixtures/interactive-dev-tests/tests/index.test.ts b/fixtures/interactive-dev-tests/tests/index.test.ts
@@ -7,7 +7,7 @@ import rl from "node:readline";
 import stream from "node:stream";
 import { setTimeout } from "node:timers/promises";
 import stripAnsi from "strip-ansi";
-import { fetch, RequestInfo } from "undici";
+import { fetch } from "undici";
 import {
 	afterAll,
 	afterEach,
@@ -473,7 +473,8 @@ baseDescribe.skipIf(
 				expect(ids.length).toBe(1);
 			}, WAITFOR_OPTIONS);
 
-			wrangler.pty.kill("SIGINT");
+			// ctrl + c
+			wrangler.pty.write("\x03");
 			await new Promise<void>((resolve) => {
 				wrangler.pty.onExit(() => resolve());
 			});
@@ -756,7 +757,8 @@ baseDescribe.skipIf(
 			const ids = getContainerIds();
 			expect(ids.length).toBe(2);
 
-			wrangler.pty.kill("SIGINT");
+			// ctrl + c
+			wrangler.pty.write("\x03");
 			await new Promise<void>((resolve) => {
 				wrangler.pty.onExit(() => resolve());
 			});
diff --git a/packages/wrangler/src/api/startDevWorker/LocalRuntimeController.ts b/packages/wrangler/src/api/startDevWorker/LocalRuntimeController.ts
@@ -415,8 +415,8 @@ export class LocalRuntimeController extends RuntimeController {
 
 	#teardown = async (): Promise<void> => {
 		logger.debug("LocalRuntimeController teardown beginning...");
-
 		process.off("exit", this.cleanupContainers);
+		this.cleanupContainers();
 
 		if (this.#mf) {
 			logger.log(chalk.dim("⎔ Shutting down local server..."));
diff --git a/packages/wrangler/src/api/startDevWorker/MultiworkerRuntimeController.ts b/packages/wrangler/src/api/startDevWorker/MultiworkerRuntimeController.ts
@@ -291,7 +291,6 @@ export class MultiworkerRuntimeController extends LocalRuntimeController {
 
 	#teardown = async (): Promise<void> => {
 		logger.debug("MultiworkerRuntimeController teardown beginning...");
-
 		if (this.#mf) {
 			logger.log(chalk.dim("⎔ Shutting down local server..."));
 		}
