Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/improve handling of jobs (#1864)
Thomas Kaul654446f06815
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 551628c19f..d2ee88e614 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0## Unreleased+### Changed++- Enabled the configuration to immediately remove queue jobs on complete+- Refactored the implementation of removing queue jobs+### Fixed- Fixed the unique job ids of the gather asset profile processdiff --git a/apps/api/src/app/admin/queue/queue.service.ts b/apps/api/src/app/admin/queue/queue.service.tsindex ebaab6d94e..81b32ddbbf 100644--- a/apps/api/src/app/admin/queue/queue.service.ts+++ b/apps/api/src/app/admin/queue/queue.service.ts@@ -4,7 +4,7 @@ import {} from '@ghostfolio/common/config';import { AdminJobs } from '@ghostfolio/common/interfaces';import { InjectQueue } from '@nestjs/bull';-import { Injectable, Logger } from '@nestjs/common';+import { Injectable } from '@nestjs/common';import { JobStatus, Queue } from 'bull';@Injectable()@@ -23,14 +23,11 @@ export class QueueService {}: {status?: JobStatus[];}) {- const jobs = await this.dataGatheringQueue.getJobs(status);-- for (const job of jobs) {- try {- await job.remove();- } catch (error) {- Logger.warn(error, 'QueueService');- }+ for (const statusItem of status) {+ await this.dataGatheringQueue.clean(+ 300,+ statusItem === 'waiting' ? 'wait' : statusItem+ );}}@@ -44,18 +41,23 @@ export class QueueService {const jobs = await this.dataGatheringQueue.getJobs(status);const jobsWithState = await Promise.all(- jobs.slice(0, limit).map(async (job) => {- return {- attemptsMade: job.attemptsMade + 1,- data: job.data,- finishedOn: job.finishedOn,- id: job.id,- name: job.name,- stacktrace: job.stacktrace,- state: await job.getState(),- timestamp: job.timestamp- };- })+ jobs+ .filter((job) => {+ return job;+ })+ .slice(0, limit)+ .map(async (job) => {+ return {+ attemptsMade: job.attemptsMade + 1,+ data: job.data,+ finishedOn: job.finishedOn,+ id: job.id,+ name: job.name,+ stacktrace: job.stacktrace,+ state: await job.getState(),+ timestamp: job.timestamp+ };+ }));return {diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.tsindex 3319f9a3b0..171ce50d30 100644--- a/libs/common/src/lib/config.ts+++ b/libs/common/src/lib/config.ts@@ -49,9 +49,7 @@ export const GATHER_ASSET_PROFILE_PROCESS_OPTIONS: JobOptions = {type: 'exponential'},priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH,- removeOnComplete: {- age: ms('2 weeks') / 1000- }+ removeOnComplete: true};export const GATHER_HISTORICAL_MARKET_DATA_PROCESS ='GATHER_HISTORICAL_MARKET_DATA';@@ -62,9 +60,7 @@ export const GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS: JobOptions = {type: 'exponential'},priority: DATA_GATHERING_QUEUE_PRIORITY_LOW,- removeOnComplete: {- age: ms('2 weeks') / 1000- }+ removeOnComplete: true};export const HEADER_KEY_IMPERSONATION = 'Impersonation-Id';