Skip to content

Commit 826acf0

Browse files
committed
remove queue specific options
1 parent af9934f commit 826acf0

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
@@ -14,7 +14,7 @@ export default class DeferredActionQueues {
1414
this.queueNames = queueNames;
1515

1616
queueNames.reduce(function(queues, queueName) {
17-
queues[queueName] = new Queue(queueName, options[queueName], options);
17+
queues[queueName] = new Queue(queueName, options);
1818
return queues;
1919
}, this.queues);
2020
}

lib/backburner/queue.ts

+3-14
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,18 @@ 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 flush(sync?) {
26-
let { before, after } = this.options;
2724
let target;
2825
let method;
2926
let args;
@@ -35,14 +32,10 @@ export default class Queue {
3532
this._queue = [];
3633
}
3734

38-
if (before !== undefined) {
39-
before();
40-
}
41-
4235
let invoke;
4336
let queueItems = this._queueBeingFlushed;
4437
if (queueItems.length > 0) {
45-
let onError = getOnError(this.globalOptions);
38+
let onError = getOnError(this.options);
4639
invoke = onError ? this.invokeWithOnError : this.invoke;
4740

4841
for (let i = this.index; i < queueItems.length; i += 4) {
@@ -73,16 +66,12 @@ export default class Queue {
7366
}
7467

7568
if (this.index !== this._queueBeingFlushed.length &&
76-
this.globalOptions.mustYield && this.globalOptions.mustYield()) {
69+
this.options.mustYield && this.options.mustYield()) {
7770
return QUEUE_STATE.Pause;
7871
}
7972
}
8073
}
8174

82-
if (after !== undefined) {
83-
after();
84-
}
85-
8675
this._queueBeingFlushed.length = 0;
8776
this.index = 0;
8877
if (sync !== false && this._queue.length > 0) {

0 commit comments

Comments
 (0)