TypeScript
fix(server): Run now on a scheduled task says why it was refused (#29620)
Alex Southwellc64117dc8ae5
diff --git a/apps/server/src/scheduledTasks/ScheduledTaskService.test.ts b/apps/server/src/scheduledTasks/ScheduledTaskService.test.tsindex b37932dc1c9..c7b0e31f4f0 100644--- a/apps/server/src/scheduledTasks/ScheduledTaskService.test.ts+++ b/apps/server/src/scheduledTasks/ScheduledTaskService.test.ts@@ -399,6 +399,8 @@ it.effect("thread cleanup notifies subscribers and a finishing run cannot recreaconst run = yield* service.runNow({ id: task.id }).pipe(Effect.forkChild);yield* Deferred.await(started);yield* Deferred.await(running);+ const refused = yield* service.runNow({ id: task.id }).pipe(Effect.flip);+ assert.equal(refused.message, "Schedule task is already running.");yield* service.deleteForThread(threadId);yield* Deferred.await(removed);yield* Deferred.succeed(release, undefined);diff --git a/apps/server/src/scheduledTasks/ScheduledTaskService.ts b/apps/server/src/scheduledTasks/ScheduledTaskService.tsindex afeb73de3df..8e859d98a36 100644--- a/apps/server/src/scheduledTasks/ScheduledTaskService.ts+++ b/apps/server/src/scheduledTasks/ScheduledTaskService.ts@@ -1494,7 +1494,9 @@ export const layer = Layer.effect(}return yield* runTask(task, "manual").pipe(Effect.mapError((cause) =>- taskError("Could not run schedule task.", { taskId: input.id, cause }),+ isScheduledTaskError(cause)+ ? cause+ : taskError("Could not run schedule task.", { taskId: input.id, cause }),),);});