Skip to content

Commit beabee1

Browse files
committed
remove queue specific options
1 parent 3080a36 commit beabee1

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

lib/backburner/deferred-action-queues.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default class DeferredActionQueues {
1010
this.queueNames = queueNames;
1111

1212
queueNames.reduce(function(queues, queueName) {
13-
queues[queueName] = new Queue(queueName, options[queueName], options);
13+
queues[queueName] = new Queue(queueName, options);
1414
return queues;
1515
}, this.queues);
1616
}

lib/backburner/queue.ts

+3-14
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ export const enum QUEUE_STATE {
99

1010
export default class Queue {
1111
private name: string;
12-
private globalOptions: any;
1312
private options: any;
1413
private _queueBeingFlushed: any[] = [];
1514
private targetQueues = new Map();
1615
private index = 0;
1716
private _queue: any[] = [];
1817

19-
constructor(name: string, options: any = {}, globalOptions: any = {}) {
18+
constructor(name: string, options: any = {}) {
2019
this.name = name;
2120
this.options = options;
22-
this.globalOptions = globalOptions;
2321
}
2422

2523
public stackFor(index) {
@@ -34,7 +32,6 @@ export default class Queue {
3432
}
3533

3634
public flush(sync?: Boolean) {
37-
let { before, after } = this.options;
3835
let target;
3936
let method;
4037
let args;
@@ -46,14 +43,10 @@ export default class Queue {
4643
this._queue = [];
4744
}
4845

49-
if (before !== undefined) {
50-
before();
51-
}
52-
5346
let invoke;
5447
let queueItems = this._queueBeingFlushed;
5548
if (queueItems.length > 0) {
56-
let onError = getOnError(this.globalOptions);
49+
let onError = getOnError(this.options);
5750
invoke = onError ? this.invokeWithOnError : this.invoke;
5851

5952
for (let i = this.index; i < queueItems.length; i += 4) {
@@ -84,16 +77,12 @@ export default class Queue {
8477
}
8578

8679
if (this.index !== this._queueBeingFlushed.length &&
87-
this.globalOptions.mustYield && this.globalOptions.mustYield()) {
80+
this.options.mustYield && this.options.mustYield()) {
8881
return QUEUE_STATE.Pause;
8982
}
9083
}
9184
}
9285

93-
if (after !== undefined) {
94-
after();
95-
}
96-
9786
this._queueBeingFlushed.length = 0;
9887
this.index = 0;
9988
if (sync !== false && this._queue.length > 0) {

0 commit comments

Comments
 (0)