simple-worker
Advanced tools
Comparing version 3.0.0 to 3.0.1
{ | ||
"name": "simple-worker", | ||
"version": "3.0.0", | ||
"version": "3.0.1", | ||
"description": "A drop-dead simple priority job queue", | ||
@@ -5,0 +5,0 @@ "main": "./src/index.js", |
@@ -42,5 +42,5 @@ const BullQueue = require('bull') | ||
job_id: job.id, | ||
attempt: job.attemptsMade, | ||
name: jobName, | ||
data: jobData | ||
job_attempt: job.attemptsMade, | ||
job_name: jobName, | ||
job_data: jobData | ||
}) | ||
@@ -54,3 +54,3 @@ }) | ||
if (!configuration) { | ||
this.logger.error('job_errored', { name, error_message: 'Job configuration not found' }) | ||
this.logger.error('job_errored', { job_name: name, error_message: 'Job configuration not found' }) | ||
throw new Error(`Job configuration not found`) | ||
@@ -66,3 +66,3 @@ } | ||
this.logger.info('job_queued', { name, data }) | ||
this.logger.info('job_queued', { job_name: name, job_data: data }) | ||
return this._queue.add('job', jobData, jobOptions) | ||
@@ -76,3 +76,3 @@ } | ||
const schedule = cronstring(job.scheduling) ? cronstring(job.scheduling) : job.scheduling | ||
this.logger.info('job_scheduled', { name: job.name, schedule }) | ||
this.logger.info('job_scheduled', { job_name: job.name, job_schedule: schedule }) | ||
scheduler.scheduleJob(schedule, () => this.add(job.name)) | ||
@@ -90,3 +90,6 @@ }) | ||
if (!configuration) { | ||
return this.logger.error('job_errored', { name: jobName, error_message: 'Job configuration not found' }) | ||
return this.logger.error('job_errored', { | ||
job_name: jobName, | ||
error_message: 'Job configuration not found' | ||
}) | ||
} | ||
@@ -96,5 +99,5 @@ | ||
job_id: job.id, | ||
attempt: job.attemptsMade, | ||
name: jobName, | ||
data: jobData | ||
job_attempt: job.attemptsMade, | ||
job_name: jobName, | ||
job_data: jobData | ||
}) | ||
@@ -106,5 +109,5 @@ | ||
job_id: job.id, | ||
attempt: job.attemptsMade, | ||
name: jobName, | ||
data: jobData, | ||
job_attempt: job.attemptsMade, | ||
job_name: jobName, | ||
job_data: jobData, | ||
...values | ||
@@ -130,7 +133,6 @@ }) | ||
job_id: job.id, | ||
attempt: job.attemptsMade, | ||
name: jobName, | ||
data: jobData, | ||
duration: new Date() - start, | ||
result | ||
job_attempt: job.attemptsMade, | ||
job_name: jobName, | ||
job_data: jobData, | ||
job_duration: new Date() - start | ||
}) | ||
@@ -143,6 +145,6 @@ | ||
job_id: job.id, | ||
attempt: job.attemptsMade, | ||
name: jobName, | ||
data: jobData, | ||
duration: new Date() - start | ||
job_attempt: job.attemptsMade, | ||
job_name: jobName, | ||
job_data: jobData, | ||
job_duration: new Date() - start | ||
}) | ||
@@ -152,6 +154,6 @@ } else { | ||
job_id: job.id, | ||
attempt: job.attemptsMade, | ||
name: jobName, | ||
data: jobData, | ||
duration: new Date() - start, | ||
job_attempt: job.attemptsMade, | ||
job_name: jobName, | ||
job_data: jobData, | ||
job_duration: new Date() - start, | ||
error_message: error.message, | ||
@@ -158,0 +160,0 @@ error_stack: error.stack |
@@ -10,4 +10,4 @@ /* eslint-env jest */ | ||
if (values) { | ||
if (typeof values.duration !== 'undefined') { | ||
values.duration = 9001 | ||
if (typeof values.job_duration !== 'undefined') { | ||
values.job_duration = 9001 | ||
} | ||
@@ -18,5 +18,9 @@ | ||
} | ||
if (typeof values.job_data === 'undefined') { | ||
delete values.job_data | ||
} | ||
} | ||
logs.push({ level, kind, values }) | ||
logs.push({ _level: level, _kind: kind, ...values }) | ||
} | ||
@@ -23,0 +27,0 @@ |
Sorry, the diff of this file is not supported yet
656
32008