Skip to content

feat(catalog-etl): wrap shouldSkip() in outer try/catch to prevent unhandled cron errors #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GitAddRemote wants to merge 1 commit into
base: feature/ISSUE-221
Choose a base branch
from
Open

feat(catalog-etl): wrap shouldSkip() in outer try/catch to prevent unhandled cron errors #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions backend/src/modules/catalog-etl/schedulers/catalog-etl.scheduler.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,16 @@ describe('CatalogEtlScheduler.scheduledTerminalEtl', () => {
expect(mockRunStep).toHaveBeenCalledTimes(1);
expect(mockRunStep).toHaveBeenCalledWith('terminals-sync');
});

it('logs error and does not throw when the skip guard throws', async () => {
mockGetLastSuccessfulStepRun.mockRejectedValueOnce(
new Error('db connection lost'),
);
await expect(makeScheduler().scheduledTerminalEtl()).resolves.not.toThrow();
expect(mockRunStep).not.toHaveBeenCalled();
expect(mockLogger.error).toHaveBeenCalledWith(
expect.objectContaining({ err: expect.any(Error) }),
'terminal ETL skip guard failed',
);
});
});
54 changes: 29 additions & 25 deletions backend/src/modules/catalog-etl/schedulers/catalog-etl.scheduler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,43 @@ export class CatalogEtlScheduler {

@Cron('0 * * * *', { name: 'terminal-etl' })
async scheduledTerminalEtl(): Promise<void> {
if (await this.shouldSkip('terminals-sync')) return;
this.logger.info('Starting scheduled terminal ETL');

try {
await this.catalogEtlService.runStep('terminals-sync');
} catch (err: unknown) {
if (err instanceof ConflictException) {
this.logger.debug(
if (await this.shouldSkip('terminals-sync')) return;
this.logger.info('Starting scheduled terminal ETL');

try {
await this.catalogEtlService.runStep('terminals-sync');
} catch (err: unknown) {
if (err instanceof ConflictException) {
this.logger.debug(
{ err },
'Scheduled terminal ETL skipped: ETL lock already held',
);
return;
}
this.logger.error(
{ err },
'Scheduled terminal ETL skipped: ETL lock already held',
'terminals-sync failed; skipping terminal-distances-sync',
);
return;
}
this.logger.error(
{ err },
'terminals-sync failed; skipping terminal-distances-sync',
);
return;
}

if (await this.shouldSkip('terminal-distances-sync')) return;
if (await this.shouldSkip('terminal-distances-sync')) return;

try {
await this.catalogEtlService.runStep('terminal-distances-sync');
} catch (err: unknown) {
if (err instanceof ConflictException) {
this.logger.debug(
{ err },
'terminal-distances-sync skipped: ETL lock already held',
);
return;
try {
await this.catalogEtlService.runStep('terminal-distances-sync');
} catch (err: unknown) {
if (err instanceof ConflictException) {
this.logger.debug(
{ err },
'terminal-distances-sync skipped: ETL lock already held',
);
return;
}
this.logger.error({ err }, 'terminal-distances-sync failed');
}
this.logger.error({ err }, 'terminal-distances-sync failed');
} catch (err: unknown) {
this.logger.error({ err }, 'terminal ETL skip guard failed');
}
}

Expand Down
Loading