w33ble/elastiq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only send attempt message if no output

Browse Source 
always append failure message if one exists
This commit is contained in:
Joe Fleming
2016-04-29 17:15:29 -07:00
parent 683903512b
commit 3b8127874b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/worker.js
View File

@@ -41,7 +41,8 @@ export default class Job extends events.EventEmitter {
const attempts = job._source.attempts + 1; const attempts = job._source.attempts + 1;
if (attempts > job._source.max_attempts) { if (attempts > job._source.max_attempts) {
return this._failJob(job, `Max attempts reached (${job._source.max_attempts})`) const msg = (!job._source.output) ? `Max attempts reached (${job._source.max_attempts})` : false;
return this._failJob(job, msg)
.then(() => false); .then(() => false);
} }
@@ -70,13 +71,13 @@ export default class Job extends events.EventEmitter {
}); });
} }
_failJob(job, msg) { _failJob(job, msg = false) {
this.debug(`Failing job ${job._id}`); this.debug(`Failing job ${job._id}`);
const doc = { const doc = {
status: jobStatuses.JOB_STATUS_FAILED status: jobStatuses.JOB_STATUS_FAILED
}; };
if (!job._source.output) { if (msg) {
doc.output = { doc.output = {
content_type: 'text/plain', content_type: 'text/plain',
content: msg content: msg
@@ -91,7 +92,7 @@ export default class Job extends events.EventEmitter {
body: { doc } body: { doc }
}) })
.catch((err) => { .catch((err) => {
if (err.statusCode === 409) return false; if (err.statusCode === 409) return true;
throw err; throw err;
}); });
} }