change the job scontructor, update tests

This commit is contained in:
2016-04-22 17:03:01 -07:00
parent 3318c775c0
commit 730ec68bfa
3 changed files with 31 additions and 29 deletions

View File

@@ -1,7 +1,6 @@
import events from 'events';
import createClient from './helpers/es_client';
import indexTimestamp from './helpers/index_timestamp';
import createIndex from './helpers/create_index';
import Job from './job.js';
import Worker from './worker.js';
import { omit } from 'lodash';
@@ -22,20 +21,23 @@ export default class Elastique extends events.EventEmitter {
}
_initTasks() {
const timestamp = indexTimestamp(this.settings.interval);
var initTasks = [
this.client.ping({ timeout: 3000 }),
createIndex(this.client, `${this.index}-${timestamp}`),
];
return Promise.all(initTasks);
}
add(type, payload, opts = {}) {
const timestamp = indexTimestamp(this.settings.interval);
const index = `${this.index}-${timestamp}`;
const options = Object.assign({
timeout: this.settings.timeout
}, opts);
const job = new Job(this, type, payload, options);
const job = new Job(this.client, index, type, payload, options);
return job;
}

View File

@@ -3,20 +3,21 @@ import { isPlainObject, omit } from 'lodash';
import { JOB_STATUS_PENDING } from './helpers/constants';
export default class Job extends events.EventEmitter {
constructor(queue, type, payload, timeout = 10000) {
constructor(client, index, type, payload, timeout = 10000) {
if (typeof type !== 'string') throw new Error('Type must be a string');
if (!isPlainObject(payload)) throw new Error('Payload must be a plain object');
super();
this.queue = queue;
this.client = client;
this.index = index;
this.type = type;
this.payload = payload;
this.timeout = timeout;
this.status = JOB_STATUS_PENDING;
this.ready = this.queue.client.index({
index: this.queue.index,
this.ready = this.client.index({
index: this.index,
type: this.type,
body: {
payload: this.payload,