Revert " Simplify config imports in cli package (#1840)" (#1931)

This reverts commit c21c8b3369.
This commit is contained in:
Ben Hesseldieck
2021-06-23 11:20:07 +02:00
committed by GitHub
parent 92a2e863f3
commit d3a1d3ffef
43 changed files with 97 additions and 107 deletions

View File

@@ -1,14 +1,14 @@
import * as Bull from 'bull';
import { config } from '@config';
import * as config from '../config';
import { IBullJobData } from './Interfaces';
export class Queue {
private jobQueue: Bull.Queue;
constructor() {
const prefix = config.get('queue.bull.prefix') as string;
const redisOptions = config.get('queue.bull.redis') as object;
// Disabling ready check is necessary as it allows worker to
// Disabling ready check is necessary as it allows worker to
// quickly reconnect to Redis if Redis crashes or is unreachable
// for some time. With it enabled, worker might take minutes to realize
// redis is back up and resume working.
@@ -16,25 +16,25 @@ export class Queue {
// @ts-ignore
this.jobQueue = new Bull('jobs', { prefix, redis: redisOptions, enableReadyCheck: false });
}
async add(jobData: IBullJobData, jobOptions: object): Promise<Bull.Job> {
return await this.jobQueue.add(jobData,jobOptions);
}
async getJob(jobId: Bull.JobId): Promise<Bull.Job | null> {
return await this.jobQueue.getJob(jobId);
}
async getJobs(jobTypes: Bull.JobStatus[]): Promise<Bull.Job[]> {
return await this.jobQueue.getJobs(jobTypes);
}
getBullObjectInstance(): Bull.Queue {
return this.jobQueue;
}
/**
*
*
* @param job A Bull.Job instance
* @returns boolean true if we were able to securely stop the job
*/
@@ -62,6 +62,6 @@ export function getInstance(): Queue {
if (activeQueueInstance === undefined) {
activeQueueInstance = new Queue();
}
return activeQueueInstance;
}