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

update emit calls with constants

Browse Source
This commit is contained in:
Joe Fleming
2016-07-08 15:30:04 -07:00
parent 919fec4835
commit 3934f0cd1b
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/index.js
View File

@@ -2,7 +2,7 @@ import events from 'events';
import createClient from './helpers/es_client'; import createClient from './helpers/es_client';
import indexTimestamp from './helpers/index_timestamp'; import indexTimestamp from './helpers/index_timestamp';
import logger from './helpers/logger'; import logger from './helpers/logger';
import { defaultSettings } from './helpers/constants'; import constants from './helpers/constants';
import Job from './job.js'; import Job from './job.js';
import Worker from './worker.js'; import Worker from './worker.js';
import omit from 'lodash.omit'; import omit from 'lodash.omit';
@@ -16,14 +16,14 @@ export default class Esqueue extends events.EventEmitter {
super(); super();
this.index = index; this.index = index;
this.settings = Object.assign({ this.settings = Object.assign({
interval: defaultSettings.DEFAULT_SETTING_INTERVAL, interval: constants.DEFAULT_SETTING_INTERVAL,
timeout: defaultSettings.DEFAULT_SETTING_TIMEOUT, timeout: constants.DEFAULT_SETTING_TIMEOUT,
doctype: defaultSettings.DEFAULT_SETTING_DOCTYPE, doctype: constants.DEFAULT_SETTING_DOCTYPE,
}, omit(options, [ 'client' ])); }, omit(options, [ 'client' ]));
this.client = createClient(options.client || {}); this.client = createClient(options.client || {});
this._workers = []; this._workers = [];
this._initTasks().catch((err) => this.emit('error', err)); this._initTasks().catch((err) => this.emit(constants.EVENT_QUEUE_ERROR, err));
} }
_initTasks() { _initTasks() {

4
src/job.js
View File

@@ -56,11 +56,11 @@ export default class Job extends events.EventEmitter {
version: doc._version, version: doc._version,
}; };
this.debug(`Job created in index ${this.index}`); this.debug(`Job created in index ${this.index}`);
this.emit('created', this.document); this.emit(contstants.EVENT_JOB_CREATED, this.document);
}) })
.catch((err) => { .catch((err) => {
this.debug('Job creation failed', err); this.debug('Job creation failed', err);
this.emit('error', err); this.emit(contstants.EVENT_JOB_ERROR, err);
}); });
} }

15
src/worker.js
View File

@@ -69,7 +69,7 @@ export default class Job extends events.EventEmitter {
.catch((err) => { .catch((err) => {
if (err.statusCode === 409) return true; if (err.statusCode === 409) return true;
this.debug(`_claimJob failed on job ${job._id}`, err); this.debug(`_claimJob failed on job ${job._id}`, err);
this.emit('claim_error', err); this.emit(constants.EVENT_WORKER_JOB_CLAIM_ERROR, err);
return false; return false;
}); });
} }
@@ -97,8 +97,8 @@ export default class Job extends events.EventEmitter {
.then(() => true) .then(() => true)
.catch((err) => { .catch((err) => {
if (err.statusCode === 409) return true; if (err.statusCode === 409) return true;
this.debug(`_failJob failed on job ${job._id}`, err); this.debug(`_failJob failed to update job ${job._id}`, err);
this.emit('fail_error', err); this.emit(constants.EVENT_WORKER_FAIL_UPDATE_ERROR, err);
return false; return false;
}); });
} }
@@ -170,7 +170,7 @@ export default class Job extends events.EventEmitter {
.catch((err) => { .catch((err) => {
if (err.statusCode === 409) return false; if (err.statusCode === 409) return false;
this.debug(`Failure saving job output ${job._id}`, err); this.debug(`Failure saving job output ${job._id}`, err);
this.emit('job_error', err); this.emit(constants.EVENT_WORKER_JOB_UPDATE_ERROR, err);
}); });
}, (jobErr) => { }, (jobErr) => {
if (!jobErr) { if (!jobErr) {
@@ -182,12 +182,12 @@ export default class Job extends events.EventEmitter {
// job execution failed // job execution failed
if (jobErr.type === 'WorkerTimeoutError') { if (jobErr.type === 'WorkerTimeoutError') {
this.debug(`Timeout on job ${job._id}`); this.debug(`Timeout on job ${job._id}`);
this.emit('job_timeout', jobErr); this.emit(constants.EVENT_WORKER_JOB_TIMEOUT_ERROR, jobErr);
return; return;
} }
this.debug(`Failure occurred on job ${job._id}`, jobErr); this.debug(`Failure occurred on job ${job._id}`, jobErr);
this.emit('job_error', jobErr); this.emit(constants.EVENT_WORKER_JOB_EXECUTION_ERROR, jobErr);
return this._failJob(job, (jobErr.toString) ? jobErr.toString() : false); return this._failJob(job, (jobErr.toString) ? jobErr.toString() : false);
}); });
} }
@@ -235,7 +235,6 @@ export default class Job extends events.EventEmitter {
.then(() => this._startJobPolling()) .then(() => this._startJobPolling())
.catch((err) => { .catch((err) => {
this.debug('Error claiming jobs', err); this.debug('Error claiming jobs', err);
this.emit('error', err);
this._startJobPolling(); this._startJobPolling();
}); });
} }
@@ -289,7 +288,7 @@ export default class Job extends events.EventEmitter {
if (err.status === 404) return []; if (err.status === 404) return [];
this.debug('job querying failed', err); this.debug('job querying failed', err);
this.emit('error', err); this.emit(constants.EVENT_WORKER_JOB_SEARCH_ERROR, err);
}); });
} }
} }