From d9a0a4b4674d3d16772cd0cbabf4dd4fee34d423 Mon Sep 17 00:00:00 2001 From: bnechyporenko Date: Tue, 16 Jan 2024 13:31:06 +0100 Subject: [PATCH] wip Signed-off-by: bnechyporenko --- plugins/scaffolder-backend/api-report.md | 2 +- .../src/scaffolder/tasks/DatabaseTaskStore.ts | 2 +- .../src/scaffolder/tasks/StorageTaskBroker.ts | 2 +- plugins/scaffolder-backend/src/scaffolder/tasks/types.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md index a3a3531bb3..fd2d368f15 100644 --- a/plugins/scaffolder-backend/api-report.md +++ b/plugins/scaffolder-backend/api-report.md @@ -590,7 +590,7 @@ export type TaskStoreListEventsOptions = { // @public export type TaskStoreRecoverTaskOptions = { - timeoutS: HumanDuration; + timeout: HumanDuration; }; // @public diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts index 7f7dd01a6d..b7d7517c10 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DatabaseTaskStore.ts @@ -482,7 +482,7 @@ export class DatabaseTaskStore implements TaskStore { async recoverTasks(options: TaskStoreRecoverTaskOptions): Promise { const taskIdsToRecover: string[] = []; - const timeoutS = Duration.fromObject(options.timeoutS).as('seconds'); + const timeoutS = Duration.fromObject(options.timeout).as('seconds'); await this.db.transaction(async tx => { let heartbeatInterval = this.db.raw( diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts index 467da0f9de..5bd72d05a2 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts @@ -216,7 +216,7 @@ export class StorageTaskBroker implements TaskBroker { if (enabled) { const recoveredTaskIds = (await this.storage.recoverTasks?.({ - timeoutS: readDuration( + timeout: readDuration( this.config, 'scaffolder.EXPERIMENTAL_recoverTasksTimeout', { diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts index c505f0f978..d113e23c5b 100644 --- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts +++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts @@ -147,7 +147,7 @@ export type TaskStoreCreateTaskOptions = { * @public */ export type TaskStoreRecoverTaskOptions = { - timeoutS: HumanDuration; + timeout: HumanDuration; }; /**