GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 23:01:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19449 from storybookjs/ensure-tasks-terminate

Browse Source 
Ensure we kill all controllers before exiting
This commit is contained in:
Tom Coleman 2022-10-12 12:43:49 +11:00 committed by GitHub
commit 8c96b5f8bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/task.ts
View File

@ -268,10 +268,12 @@ function writeTaskList(statusMap: Map<Task, TaskStatus>) {
async function runTask(task: Task, details: TemplateDetails, optionValues: PassedOptionValues) {
const startTime = new Date();
try {
await task.run(details, optionValues);
const controller = await task.run(details, optionValues);
if (details.junitFilename && !task.junit)
await writeJunitXml(getTaskKey(task), details.key, startTime);
return controller;
} catch (err) {
if (details.junitFilename && !task.junit)
await writeJunitXml(getTaskKey(task), details.key, startTime, err);
@ -382,6 +384,7 @@ async function run() {
setUnready(startFromTask);
}
const controllers: AbortController[] = [];
for (let i = 0; i < sortedTasks.length; i += 1) {
const task = sortedTasks[i];
const status = statuses.get(task);
@ -398,11 +401,13 @@ async function run() {
writeTaskList(statuses);
try {
await runTask(task, details, {
const controller = await runTask(task, details, {
...optionValues,
// Always debug the final task so we can see it's output fully
debug: sortedTasks[i] === finalTask ? true : optionValues.debug,
});
if (controller) controllers.push(controller);
} catch (err) {
logger.error(`Error running task ${getTaskKey(task)}:`);
logger.error();
@ -440,6 +445,9 @@ async function run() {
await new Promise(() => {});
}
}
controllers.forEach((controller) => {
controller.abort();
});
}
return 0;