From 3763fdf830fbc6d0f2d134d0d66513b2dab39964 Mon Sep 17 00:00:00 2001 From: Derek Burgman Date: Sat, 8 Oct 2022 21:45:37 -0500 Subject: [PATCH] fix: fixed DbxFirebaseDevelopmentSchedulerService error handling - fixed issue where error would be cleared every time the scheduled tasks ran regardless of whether or not an error occurred --- .../development.scheduler.service.ts | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/dbx-firebase/src/lib/development/development.scheduler.service.ts b/packages/dbx-firebase/src/lib/development/development.scheduler.service.ts index c2a5986fc..72a7a68fe 100644 --- a/packages/dbx-firebase/src/lib/development/development.scheduler.service.ts +++ b/packages/dbx-firebase/src/lib/development/development.scheduler.service.ts @@ -59,14 +59,19 @@ export class DbxFirebaseDevelopmentSchedulerService implements Initialized { exhaustMap(() => { console.log('Running scheduled tasks in order... ', executionOrder); - return PromiseUtility.runTasksForValues(executionOrder, (taskName) => this.runScheduledFunction(taskName), { sequential: true, retriesAllowed: 0, retryWait: 0 }).catch((e) => { - console.log('Failed running scheduled task: ', e); - this._error.next(true); - }); + return PromiseUtility.runTasksForValues(executionOrder, (taskName) => this.runScheduledFunction(taskName), { sequential: true, retriesAllowed: 0, retryWait: 0 }) + .then(() => true) + .catch((e) => { + console.log('Failed running scheduled task: ', e); + this._error.next(true); + return false; + }); }), - tap(() => { - console.log('Successfully finished running all scheduled tasks.'); - this._error.next(false); + tap((success) => { + if (success) { + console.log('Successfully finished running all scheduled tasks.'); + this._error.next(false); + } }) ); })