Enforce cleanup termination in certain cases

SAP · Nov 10, 2023 · 7e8aa36 · 7e8aa36
1 parent dacc9e4
commit 7e8aa36
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/lib/processors/minifier.js b/lib/processors/minifier.js
@@ -28,22 +28,28 @@ function getPool(taskUtil) {
 			workerType: "auto",
 			maxWorkers
 		});
-		taskUtil.registerCleanupTask(() => {
+		taskUtil.registerCleanupTask((options) => {
 			const attemptPoolTermination = () => {
 				log.verbose(`Attempt to terminate the workerpool...`);
 
+				if (!pool) {
+					return;
+				}
+
+				const forceTerminate = !!options && !!options.exitCode;
+
 				// There are many stats that could be used, but these ones seem the most
 				// convenient. When all the (available) workers are idle, then it's safe to terminate.
 				const {idleWorkers, totalWorkers} = pool.stats();
-				if (idleWorkers !== totalWorkers) {
+				if (idleWorkers !== totalWorkers && !forceTerminate) {
 					return new Promise((resolve) =>
 						setTimeout(() => resolve(attemptPoolTermination()), 100) // Retry after a while
 					);
 				}
 
 				const poolToBeTerminated = pool;
 				pool = null;
-				return poolToBeTerminated.terminate();
+				return poolToBeTerminated.terminate(forceTerminate);
 			};
 
 			return attemptPoolTermination();

diff --git a/lib/tasks/buildThemes.js b/lib/tasks/buildThemes.js
@@ -23,22 +23,28 @@ function getPool(taskUtil) {
 			workerType: "thread",
 			maxWorkers
 		});
-		taskUtil.registerCleanupTask(() => {
+		taskUtil.registerCleanupTask((options) => {
 			const attemptPoolTermination = () => {
 				log.verbose(`Attempt to terminate the workerpool...`);
 
+				if (!pool) {
+					return;
+				}
+
+				const forceTerminate = !!options && !!options.exitCode;
+
 				// There are many stats that could be used, but these ones seem the most
 				// convenient. When all the (available) workers are idle, then it's safe to terminate.
 				const {idleWorkers, totalWorkers} = pool.stats();
-				if (idleWorkers !== totalWorkers) {
+				if (idleWorkers !== totalWorkers && !forceTerminate) {
 					return new Promise((resolve) =>
 						setTimeout(() => resolve(attemptPoolTermination()), 100) // Retry after a while
 					);
 				}
 
 				const poolToBeTerminated = pool;
 				pool = null;
-				return poolToBeTerminated.terminate();
+				return poolToBeTerminated.terminate(forceTerminate);
 			};
 
 			return attemptPoolTermination();