@midwayjs/bull 3.0.2 → 3.0.4

package/dist/config/config.default.d.ts

@@ -2,10 +2,14 @@ export declare const bull: {
     defaultQueueOptions: {
         prefix: string;
     };
+    defaultJobOptions: {
+        removeOnSuccess: boolean;
+        removeOnFail: number;
+    };
+    defaultConcurrency: number;
+    clearRepeatJobWhenStart: boolean;
     contextLoggerApplyLogger: string;
     contextLoggerFormat: (info: any) => string;
-    defaultConcurrency: number;
-    clearJobWhenStart: boolean;
 };
 export declare const midwayLogger: {
     clients: {

package/dist/config/config.default.js

@@ -3,15 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.midwayLogger = exports.bull = void 0;
 exports.bull = {
     defaultQueueOptions: {
-        prefix: 'midway-task',
+        prefix: '${midway-bull}',
     },
+    defaultJobOptions: {
+        removeOnSuccess: true,
+        removeOnFail: 10,
+    },
+    defaultConcurrency: 1,
+    clearRepeatJobWhenStart: true,
     contextLoggerApplyLogger: 'bullLogger',
     contextLoggerFormat: info => {
-        const { jobId, triggerName } = info.ctx;
-        return `${info.timestamp} ${info.LEVEL} ${info.pid} [${jobId} ${triggerName}] ${info.message}`;
+        const { jobId, from } = info.ctx;
+        return `${info.timestamp} ${info.LEVEL} ${info.pid} [${jobId} ${from.name}}] ${info.message}`;
     },
-    defaultConcurrency: 1,
-    clearJobWhenStart: true,
 };
 exports.midwayLogger = {
     clients: {

package/dist/framework.d.ts

@@ -10,7 +10,7 @@ export declare class BullQueue extends Bull implements IQueue<Job> {
 export declare class BullFramework extends BaseFramework<Application, Context, any> implements IQueueManager<BullQueue, Job> {
     private bullDefaultQueueConfig;
     private bullDefaultConcurrency;
-    private bullClearJobWhenStart;
+    private bullClearRepeatJobWhenStart;
     private queueMap;
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     configure(): any;

package/dist/framework.js

@@ -32,7 +32,7 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
         this.app = {};
         this.bullDefaultQueueConfig = this.configService.getConfiguration('bull.defaultQueueOptions');
         this.bullDefaultConcurrency = this.configService.getConfiguration('bull.defaultConcurrency');
-        this.bullClearJobWhenStart = this.configService.getConfiguration('bull.bullClearJobWhenStart');
+        this.bullClearRepeatJobWhenStart = this.configService.getConfiguration('bull.clearRepeatJobWhenStart');
     }
     configure() {
         return this.configService.getConfiguration('bull');
@@ -45,10 +45,13 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
         const processorModules = (0, decorator_1.listModule)(constants_1.BULL_PROCESSOR_KEY);
         for (const mod of processorModules) {
             const options = (0, decorator_1.getClassMetadata)(constants_1.BULL_PROCESSOR_KEY, mod);
-            this.ensureQueue(options.queueName);
-            // clear old job when start
-            if (this.bullClearJobWhenStart) {
-                await this.queueMap.get(options.queueName).obliterate({ force: true });
+            const currentQueue = this.ensureQueue(options.queueName);
+            // clear old repeat job when start
+            if (this.bullClearRepeatJobWhenStart) {
+                const jobs = await currentQueue.getRepeatableJobs();
+                for (const job of jobs) {
+                    await currentQueue.removeRepeatableByKey(job.key);
+                }
             }
             await this.addProcessor(mod, options.queueName, options.concurrency);
             if ((_a = options.jobOptions) === null || _a === void 0 ? void 0 : _a.repeat) {

package/index.d.ts

@@ -8,7 +8,7 @@ declare module '@midwayjs/core/dist/interface' {
       defaultQueueOptions?: bull.QueueOptions;
       defaultJobOptions?: bull.JobOptions;
       defaultConcurrency?: number;
-      clearJobWhenStart?: boolean;
+      clearRepeatJobWhenStart?: boolean;
     };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",