diff --git a/example/bullmq.js b/example/bullmq.js index 64e323f1..a0e19e5a 100644 --- a/example/bullmq.js +++ b/example/bullmq.js @@ -72,6 +72,18 @@ async function main() { // adding delayed jobs const delayedJob = await queue.add('delayed', {}, {delay: 60 * 1000}); + await queue.add( + 'delayed', + {}, + { + delay: 1000, + attempts: 4, + backoff: { + type: 'exponential', + delay: 60000, + }, + } + ); await queue.add('cron', {}, {repeat: {pattern: '* 1 * 1 *'}}); delayedJob.log('Log message'); diff --git a/src/server/views/helpers/handlebars.js b/src/server/views/helpers/handlebars.js index 971f9476..7de56cf4 100644 --- a/src/server/views/helpers/handlebars.js +++ b/src/server/views/helpers/handlebars.js @@ -76,7 +76,11 @@ const helpers = { getDelayedExecutionAt(job) { // Bull if (job.delay) { - return job.delay + getTimestamp(job); + if (job.processedOn) { + return job.processedOn + job.delay; + } else { + return job.timestamp + job.delay; + } } // Bee diff --git a/src/server/views/partials/dashboard/jobDetails.hbs b/src/server/views/partials/dashboard/jobDetails.hbs index 5f9717ce..9906735f 100644 --- a/src/server/views/partials/dashboard/jobDetails.hbs +++ b/src/server/views/partials/dashboard/jobDetails.hbs @@ -42,8 +42,16 @@
Timestamp
- {{#if (getTimestamp this)}} - {{moment (getTimestamp this) "llll"}} + {{#if queue.IS_BEE}} + {{#if this.options}} + {{#if (isNumber this.options.timestamp)}} + {{moment this.options.timestamp "llll"}} + {{/if}} + {{/if}} + {{else}} + {{#if (isNumber this.timestamp)}} + {{moment this.timestamp "llll"}} + {{/if}} {{/if}}
@@ -76,6 +84,13 @@ {{length this.options.stacktraces}} {{/if}} + + {{#if (isNumber this.attemptsStarted)}} +
+
Attempts Started
+ {{this.attemptsStarted}} +
+ {{/if}}