bullmq 5.76.5 → 5.76.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/classes/queue-events.js +2 -2
- package/dist/cjs/classes/queue-events.js.map +1 -1
- package/dist/cjs/classes/queue-getters.js +1 -1
- package/dist/cjs/classes/redis-connection.js +132 -0
- package/dist/cjs/classes/redis-connection.js.map +1 -1
- package/dist/cjs/commands/addPrioritizedJob-9.lua +1 -1
- package/dist/cjs/commands/extendLock-2.lua +1 -1
- package/dist/cjs/commands/includes/collectMetrics.lua +1 -1
- package/dist/cjs/commands/moveStalledJobsToWait-8.lua +1 -1
- package/dist/cjs/commands/moveToFinished-14.lua +2 -2
- package/dist/cjs/commands/obliterate-2.lua +1 -1
- package/dist/cjs/commands/pause-7.lua +3 -3
- package/dist/cjs/commands/releaseLock-1.lua +1 -1
- package/dist/cjs/scripts/addPrioritizedJob-9.js +1 -1
- package/dist/cjs/scripts/extendLock-2.js +1 -1
- package/dist/cjs/scripts/moveStalledJobsToWait-8.js +1 -1
- package/dist/cjs/scripts/moveToFinished-14.js +3 -3
- package/dist/cjs/scripts/obliterate-2.js +1 -1
- package/dist/cjs/scripts/pause-7.js +3 -3
- package/dist/cjs/scripts/releaseLock-1.js +1 -1
- package/dist/cjs/tsconfig-cjs.tsbuildinfo +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/classes/queue-events.js +2 -2
- package/dist/esm/classes/queue-events.js.map +1 -1
- package/dist/esm/classes/queue-getters.d.ts +1 -1
- package/dist/esm/classes/queue-getters.js +1 -1
- package/dist/esm/classes/redis-connection.d.ts +10 -0
- package/dist/esm/classes/redis-connection.js +132 -0
- package/dist/esm/classes/redis-connection.js.map +1 -1
- package/dist/esm/commands/addPrioritizedJob-9.lua +1 -1
- package/dist/esm/commands/extendLock-2.lua +1 -1
- package/dist/esm/commands/includes/collectMetrics.lua +1 -1
- package/dist/esm/commands/moveStalledJobsToWait-8.lua +1 -1
- package/dist/esm/commands/moveToFinished-14.lua +2 -2
- package/dist/esm/commands/obliterate-2.lua +1 -1
- package/dist/esm/commands/pause-7.lua +3 -3
- package/dist/esm/commands/releaseLock-1.lua +1 -1
- package/dist/esm/scripts/addPrioritizedJob-9.js +1 -1
- package/dist/esm/scripts/extendLock-2.js +1 -1
- package/dist/esm/scripts/moveStalledJobsToWait-8.js +1 -1
- package/dist/esm/scripts/moveToFinished-14.js +3 -3
- package/dist/esm/scripts/obliterate-2.js +1 -1
- package/dist/esm/scripts/pause-7.js +3 -3
- package/dist/esm/scripts/releaseLock-1.js +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +10 -10
|
@@ -57,7 +57,7 @@ class QueueEvents extends queue_base_1.QueueBase {
|
|
|
57
57
|
try {
|
|
58
58
|
this.running = true;
|
|
59
59
|
const client = await this.client;
|
|
60
|
-
// TODO:
|
|
60
|
+
// TODO: Planned for deprecation as it really has no use case
|
|
61
61
|
try {
|
|
62
62
|
await client.client('SETNAME', this.clientName(utils_1.QUEUE_EVENT_SUFFIX));
|
|
63
63
|
}
|
|
@@ -93,7 +93,7 @@ class QueueEvents extends queue_base_1.QueueBase {
|
|
|
93
93
|
id = events[i][0];
|
|
94
94
|
const args = (0, utils_1.array2obj)(events[i][1]);
|
|
95
95
|
//
|
|
96
|
-
// TODO: we may need to have a separate
|
|
96
|
+
// TODO: we may need to have a separate stream for progress data
|
|
97
97
|
// to avoid this hack.
|
|
98
98
|
switch (args.event) {
|
|
99
99
|
case 'progress':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-events.js","sourceRoot":"","sources":["../../../src/classes/queue-events.ts"],"names":[],"mappings":";;;;AAQA,oCAKkB;AAClB,6CAAyC;AAgQzC;;;;;;GAMG;AACH,MAAa,WAAY,SAAQ,sBAAS;IAIxC,YACE,IAAY,EACZ,KAA8D;QAC5D,UAAU,EAAE,EAAE;KACf,EACD,UAAmC;;YAHnC,EAAE,UAAU,EAAE,OAAO,GAAG,IAAI,OAE3B,EAFgC,IAAI,sBAArC,yBAAuC,CAAF;QAKrC,KAAK,CACH,IAAI,kCAEC,IAAI,KACP,UAAU,EAAE,IAAA,uBAAe,EAAC,UAAU,CAAC;gBACrC,CAAC,CAAe,UAAW,CAAC,SAAS;oBACnC,CAAC,CAAW,UAAW,CAAC,SAAS,CAAC,SAAS,EAAE;wBACzC,YAAY,EAAE,MAAU,UAAW,CAAC,OAAO,0CAAE,YAAY;qBAC1D,CAAC;oBACJ,CAAC,CAAe,UAAW,CAAC,SAAS,EAAE;gBACzC,CAAC,CAAC,UAAU,KAEhB,UAAU,EACV,IAAI,CACL,CAAC;QAxBI,YAAO,GAAG,KAAK,CAAC;QAChB,aAAQ,GAAG,KAAK,CAAC;QAyBvB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CACvB;YACE,eAAe,EAAE,KAAK;SACvB,EACD,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,IAAI,CAGF,KAAQ,EAAE,GAAG,IAA8B;QAC3C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,GAAG,CAGD,SAAY,EAAE,QAAgB;QAC9B,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,QAAoC,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,EAAE,CAGA,KAAQ,EAAE,QAAgB;QAC1B,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAoC,CAAC,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAGF,KAAQ,EAAE,QAAgB;QAC1B,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,QAAoC,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC;gBACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;gBAEjC,
|
|
1
|
+
{"version":3,"file":"queue-events.js","sourceRoot":"","sources":["../../../src/classes/queue-events.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ class QueueGetters extends queue_base_1.QueueBase {
|
|
|
74
74
|
/**
|
|
75
75
|
* Returns the time to live for a rate limited key in milliseconds.
|
|
76
76
|
* @param maxJobs - max jobs to be considered in rate limit state. If not passed
|
|
77
|
-
* it will return the remaining ttl without considering if max jobs is
|
|
77
|
+
* it will return the remaining ttl without considering if max jobs is exceeded.
|
|
78
78
|
* @returns -2 if the key does not exist.
|
|
79
79
|
* -1 if the key exists but has no associated expire.
|
|
80
80
|
* @see {@link https://redis.io/commands/pttl/}
|
|
@@ -15,6 +15,12 @@ const overrideMessage = [
|
|
|
15
15
|
'and will be overridden by BullMQ.',
|
|
16
16
|
].join(' ');
|
|
17
17
|
const deprecationMessage = 'BullMQ: Your redis options maxRetriesPerRequest must be null.';
|
|
18
|
+
const clusterReconnectPromise = Symbol('bullmqClusterReconnectPromise');
|
|
19
|
+
const clusterPatchedForBlocking = Symbol('bullmqClusterPatchedForBlocking');
|
|
20
|
+
const clusterOriginalBzpopmin = Symbol('bullmqClusterOriginalBzpopmin');
|
|
21
|
+
const clusterWrappedBzpopmin = Symbol('bullmqClusterWrappedBzpopmin');
|
|
22
|
+
const clusterPatchRefCount = Symbol('bullmqClusterPatchRefCount');
|
|
23
|
+
const clusterClosingRefCount = Symbol('bullmqClusterClosingRefCount');
|
|
18
24
|
class RedisConnection extends events_1.EventEmitter {
|
|
19
25
|
constructor(opts, extraOptions) {
|
|
20
26
|
super();
|
|
@@ -26,6 +32,7 @@ class RedisConnection extends events_1.EventEmitter {
|
|
|
26
32
|
this.status = 'initializing';
|
|
27
33
|
this.dbType = 'redis';
|
|
28
34
|
this.packageVersion = version_1.version;
|
|
35
|
+
this.disabledBlockingClusterReconnect = false;
|
|
29
36
|
// Set extra options defaults
|
|
30
37
|
this.extraOptions = Object.assign({ shared: false, blocking: true, skipVersionCheck: false, skipWaitingForReady: false }, extraOptions);
|
|
31
38
|
if (!(0, utils_2.isRedisInstance)(opts)) {
|
|
@@ -163,6 +170,7 @@ class RedisConnection extends events_1.EventEmitter {
|
|
|
163
170
|
// ioredis treats connection errors as a different event ('close')
|
|
164
171
|
this._client.on('close', this.handleClientClose);
|
|
165
172
|
this._client.on('ready', this.handleClientReady);
|
|
173
|
+
this.patchBlockingClusterClient();
|
|
166
174
|
if (!this.extraOptions.skipWaitingForReady) {
|
|
167
175
|
await RedisConnection.waitUntilReady(this._client);
|
|
168
176
|
}
|
|
@@ -189,6 +197,128 @@ class RedisConnection extends events_1.EventEmitter {
|
|
|
189
197
|
}
|
|
190
198
|
return this._client;
|
|
191
199
|
}
|
|
200
|
+
patchBlockingClusterClient() {
|
|
201
|
+
const client = this._client;
|
|
202
|
+
const blockingClient = client;
|
|
203
|
+
if (!this.extraOptions.blocking ||
|
|
204
|
+
!(0, utils_2.isRedisCluster)(client) ||
|
|
205
|
+
typeof blockingClient.bzpopmin !== 'function') {
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
blockingClient[clusterPatchRefCount] =
|
|
209
|
+
(blockingClient[clusterPatchRefCount] || 0) + 1;
|
|
210
|
+
this.patchedBlockingClusterClient = blockingClient;
|
|
211
|
+
if (blockingClient[clusterPatchedForBlocking]) {
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
214
|
+
const bzpopmin = blockingClient.bzpopmin;
|
|
215
|
+
const wrappedBzpopmin = async (...args) => {
|
|
216
|
+
await RedisConnection.reconnectClusterIfNeeded(blockingClient);
|
|
217
|
+
try {
|
|
218
|
+
return await bzpopmin.apply(blockingClient, args);
|
|
219
|
+
}
|
|
220
|
+
catch (error) {
|
|
221
|
+
const commandError = error;
|
|
222
|
+
if (RedisConnection.shouldReconnectClusterAfterError(blockingClient, commandError)) {
|
|
223
|
+
try {
|
|
224
|
+
await RedisConnection.reconnectCluster(blockingClient);
|
|
225
|
+
}
|
|
226
|
+
catch (_a) {
|
|
227
|
+
// Preserve the original command failure if best-effort recovery fails.
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
throw commandError;
|
|
231
|
+
}
|
|
232
|
+
};
|
|
233
|
+
blockingClient[clusterOriginalBzpopmin] = bzpopmin;
|
|
234
|
+
blockingClient[clusterWrappedBzpopmin] = wrappedBzpopmin;
|
|
235
|
+
blockingClient[clusterPatchedForBlocking] = true;
|
|
236
|
+
blockingClient.bzpopmin = wrappedBzpopmin;
|
|
237
|
+
}
|
|
238
|
+
disableBlockingClusterReconnect() {
|
|
239
|
+
const client = this.patchedBlockingClusterClient;
|
|
240
|
+
if (!client || this.disabledBlockingClusterReconnect) {
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
243
|
+
client[clusterClosingRefCount] = (client[clusterClosingRefCount] || 0) + 1;
|
|
244
|
+
this.disabledBlockingClusterReconnect = true;
|
|
245
|
+
}
|
|
246
|
+
releaseBlockingClusterClientPatch() {
|
|
247
|
+
const client = this.patchedBlockingClusterClient;
|
|
248
|
+
if (!client) {
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
if (this.disabledBlockingClusterReconnect) {
|
|
252
|
+
const closingRefCount = (client[clusterClosingRefCount] || 1) - 1;
|
|
253
|
+
if (closingRefCount > 0) {
|
|
254
|
+
client[clusterClosingRefCount] = closingRefCount;
|
|
255
|
+
}
|
|
256
|
+
else {
|
|
257
|
+
delete client[clusterClosingRefCount];
|
|
258
|
+
}
|
|
259
|
+
this.disabledBlockingClusterReconnect = false;
|
|
260
|
+
}
|
|
261
|
+
const patchRefCount = (client[clusterPatchRefCount] || 1) - 1;
|
|
262
|
+
if (patchRefCount > 0) {
|
|
263
|
+
client[clusterPatchRefCount] = patchRefCount;
|
|
264
|
+
this.patchedBlockingClusterClient = undefined;
|
|
265
|
+
return;
|
|
266
|
+
}
|
|
267
|
+
if (client[clusterOriginalBzpopmin] &&
|
|
268
|
+
client.bzpopmin === client[clusterWrappedBzpopmin]) {
|
|
269
|
+
client.bzpopmin = client[clusterOriginalBzpopmin];
|
|
270
|
+
}
|
|
271
|
+
delete client[clusterPatchRefCount];
|
|
272
|
+
delete client[clusterClosingRefCount];
|
|
273
|
+
delete client[clusterOriginalBzpopmin];
|
|
274
|
+
delete client[clusterWrappedBzpopmin];
|
|
275
|
+
delete client[clusterPatchedForBlocking];
|
|
276
|
+
this.patchedBlockingClusterClient = undefined;
|
|
277
|
+
}
|
|
278
|
+
static isClusterWithEmptyNodes(client) {
|
|
279
|
+
return typeof client.nodes === 'function' && client.nodes().length === 0;
|
|
280
|
+
}
|
|
281
|
+
static isReconnectingDisabled(client) {
|
|
282
|
+
const patchRefCount = client[clusterPatchRefCount] || 0;
|
|
283
|
+
const closingRefCount = client[clusterClosingRefCount] || 0;
|
|
284
|
+
return (patchRefCount === 0 ||
|
|
285
|
+
closingRefCount >= patchRefCount ||
|
|
286
|
+
client.status === 'end' ||
|
|
287
|
+
client.status === 'closing');
|
|
288
|
+
}
|
|
289
|
+
static async reconnectClusterIfNeeded(client) {
|
|
290
|
+
if (!RedisConnection.isReconnectingDisabled(client) &&
|
|
291
|
+
RedisConnection.isClusterWithEmptyNodes(client)) {
|
|
292
|
+
await RedisConnection.reconnectCluster(client);
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
static shouldReconnectClusterAfterError(client, error) {
|
|
296
|
+
var _a, _b;
|
|
297
|
+
if (RedisConnection.isReconnectingDisabled(client)) {
|
|
298
|
+
return false;
|
|
299
|
+
}
|
|
300
|
+
const message = [
|
|
301
|
+
error.message,
|
|
302
|
+
(_a = error.cause) === null || _a === void 0 ? void 0 : _a.message,
|
|
303
|
+
(_b = error.lastNodeError) === null || _b === void 0 ? void 0 : _b.message,
|
|
304
|
+
].join(' ');
|
|
305
|
+
return (RedisConnection.isClusterWithEmptyNodes(client) ||
|
|
306
|
+
/Command timed out|Failed to refresh slots cache/i.test(message));
|
|
307
|
+
}
|
|
308
|
+
static async reconnectCluster(client) {
|
|
309
|
+
if (RedisConnection.isReconnectingDisabled(client)) {
|
|
310
|
+
return;
|
|
311
|
+
}
|
|
312
|
+
if (!client[clusterReconnectPromise]) {
|
|
313
|
+
client[clusterReconnectPromise] = (async () => {
|
|
314
|
+
client.disconnect(false);
|
|
315
|
+
await client.connect();
|
|
316
|
+
})().finally(() => {
|
|
317
|
+
client[clusterReconnectPromise] = null;
|
|
318
|
+
});
|
|
319
|
+
}
|
|
320
|
+
await client[clusterReconnectPromise];
|
|
321
|
+
}
|
|
192
322
|
async disconnect(wait = true) {
|
|
193
323
|
const client = await this.client;
|
|
194
324
|
if (client.status !== 'end') {
|
|
@@ -223,6 +353,7 @@ class RedisConnection extends events_1.EventEmitter {
|
|
|
223
353
|
const status = this.status;
|
|
224
354
|
this.status = 'closing';
|
|
225
355
|
this.closing = true;
|
|
356
|
+
this.disableBlockingClusterReconnect();
|
|
226
357
|
try {
|
|
227
358
|
if (status === 'ready') {
|
|
228
359
|
// Not sure if we need to wait for this
|
|
@@ -246,6 +377,7 @@ class RedisConnection extends events_1.EventEmitter {
|
|
|
246
377
|
}
|
|
247
378
|
}
|
|
248
379
|
finally {
|
|
380
|
+
this.releaseBlockingClusterClientPatch();
|
|
249
381
|
this._client.off('error', this.handleClientError);
|
|
250
382
|
this._client.off('close', this.handleClientClose);
|
|
251
383
|
this._client.off('ready', this.handleClientReady);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-connection.js","sourceRoot":"","sources":["../../../src/classes/redis-connection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"redis-connection.js","sourceRoot":"","sources":["../../../src/classes/redis-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
--[[
|
|
2
|
-
Adds a
|
|
2
|
+
Adds a prioritized job to the queue by doing the following:
|
|
3
3
|
- Increases the job counter if needed.
|
|
4
4
|
- Creates a new job key with the job data.
|
|
5
5
|
- Adds the job to the "added" list so that workers gets notified.
|
|
@@ -46,7 +46,7 @@ end
|
|
|
46
46
|
|
|
47
47
|
rcall("SET", stalledCheckKey, timestamp, "PX", maxCheckTime)
|
|
48
48
|
|
|
49
|
-
-- Trim events before
|
|
49
|
+
-- Trim events before emitting them to avoid trimming events emitted in this script
|
|
50
50
|
trimEvents(metaKey, eventStreamKey)
|
|
51
51
|
|
|
52
52
|
-- Move all stalled jobs to wait
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
--[[
|
|
2
|
-
Move job from active to a finished status (completed
|
|
2
|
+
Move job from active to a finished status (completed or failed)
|
|
3
3
|
A job can only be moved to completed if it was active.
|
|
4
4
|
The job must be locked before it can be moved to a finished status,
|
|
5
5
|
and the lock must be released in this script.
|
|
@@ -127,7 +127,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- Make sure job exists
|
|
|
127
127
|
|
|
128
128
|
local eventStreamKey = KEYS[4]
|
|
129
129
|
local metaKey = KEYS[9]
|
|
130
|
-
-- Trim events before
|
|
130
|
+
-- Trim events before emitting them to avoid trimming events emitted in this script
|
|
131
131
|
trimEvents(metaKey, eventStreamKey)
|
|
132
132
|
|
|
133
133
|
local prefix = ARGV[7]
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
The queue needs to be "paused" or it will return an error
|
|
8
8
|
If the queue has currently active jobs then the script by default will return error,
|
|
9
|
-
however this behaviour can be
|
|
9
|
+
however this behaviour can be overridden using the 'force' option.
|
|
10
10
|
|
|
11
11
|
Input:
|
|
12
12
|
KEYS[1] meta
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--[[
|
|
2
|
-
Pauses or resumes a queue
|
|
2
|
+
Pauses or resumes a queue globally.
|
|
3
3
|
|
|
4
4
|
Input:
|
|
5
|
-
KEYS[1] 'wait' or 'paused'
|
|
5
|
+
KEYS[1] 'wait' or 'paused'
|
|
6
6
|
KEYS[2] 'paused' or 'wait'
|
|
7
7
|
KEYS[3] 'meta'
|
|
8
8
|
KEYS[4] 'prioritized'
|
|
9
9
|
KEYS[5] events stream key
|
|
10
10
|
KEYS[6] 'delayed'
|
|
11
|
-
KEYS
|
|
11
|
+
KEYS[7] 'marker'
|
|
12
12
|
|
|
13
13
|
ARGV[1] 'paused' or 'resumed'
|
|
14
14
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addPrioritizedJob = void 0;
|
|
4
4
|
const content = `--[[
|
|
5
|
-
Adds a
|
|
5
|
+
Adds a prioritized job to the queue by doing the following:
|
|
6
6
|
- Increases the job counter if needed.
|
|
7
7
|
- Creates a new job key with the job data.
|
|
8
8
|
- Adds the job to the "added" list so that workers gets notified.
|
|
@@ -122,7 +122,7 @@ if rcall("EXISTS", stalledCheckKey) == 1 then
|
|
|
122
122
|
return {}
|
|
123
123
|
end
|
|
124
124
|
rcall("SET", stalledCheckKey, timestamp, "PX", maxCheckTime)
|
|
125
|
-
-- Trim events before
|
|
125
|
+
-- Trim events before emitting them to avoid trimming events emitted in this script
|
|
126
126
|
trimEvents(metaKey, eventStreamKey)
|
|
127
127
|
-- Move all stalled jobs to wait
|
|
128
128
|
local stalling = rcall('SMEMBERS', stalledKey)
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.moveToFinished = void 0;
|
|
4
4
|
const content = `--[[
|
|
5
|
-
Move job from active to a finished status (completed
|
|
5
|
+
Move job from active to a finished status (completed or failed)
|
|
6
6
|
A job can only be moved to completed if it was active.
|
|
7
7
|
The job must be locked before it can be moved to a finished status,
|
|
8
8
|
and the lock must be released in this script.
|
|
@@ -56,7 +56,7 @@ local rcall = redis.call
|
|
|
56
56
|
--- Includes
|
|
57
57
|
--[[
|
|
58
58
|
Functions to collect metrics based on a current and previous count of jobs.
|
|
59
|
-
|
|
59
|
+
Granularity is fixed at 1 minute.
|
|
60
60
|
]]
|
|
61
61
|
--[[
|
|
62
62
|
Function to loop in batches.
|
|
@@ -936,7 +936,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- Make sure job exists
|
|
|
936
936
|
end
|
|
937
937
|
local eventStreamKey = KEYS[4]
|
|
938
938
|
local metaKey = KEYS[9]
|
|
939
|
-
-- Trim events before
|
|
939
|
+
-- Trim events before emitting them to avoid trimming events emitted in this script
|
|
940
940
|
trimEvents(metaKey, eventStreamKey)
|
|
941
941
|
local prefix = ARGV[7]
|
|
942
942
|
removeDeduplicationKeyIfNeededOnFinalization(prefix, jobAttributes[3], jobId)
|
|
@@ -8,7 +8,7 @@ const content = `--[[
|
|
|
8
8
|
keys, consider that this call may be slow for very large queues.
|
|
9
9
|
The queue needs to be "paused" or it will return an error
|
|
10
10
|
If the queue has currently active jobs then the script by default will return error,
|
|
11
|
-
however this behaviour can be
|
|
11
|
+
however this behaviour can be overridden using the 'force' option.
|
|
12
12
|
Input:
|
|
13
13
|
KEYS[1] meta
|
|
14
14
|
KEYS[2] base
|
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.pause = void 0;
|
|
4
4
|
const content = `--[[
|
|
5
|
-
Pauses or resumes a queue
|
|
5
|
+
Pauses or resumes a queue globally.
|
|
6
6
|
Input:
|
|
7
|
-
KEYS[1] 'wait' or 'paused'
|
|
7
|
+
KEYS[1] 'wait' or 'paused'
|
|
8
8
|
KEYS[2] 'paused' or 'wait'
|
|
9
9
|
KEYS[3] 'meta'
|
|
10
10
|
KEYS[4] 'prioritized'
|
|
11
11
|
KEYS[5] events stream key
|
|
12
12
|
KEYS[6] 'delayed'
|
|
13
|
-
KEYS
|
|
13
|
+
KEYS[7] 'marker'
|
|
14
14
|
ARGV[1] 'paused' or 'resumed'
|
|
15
15
|
Event:
|
|
16
16
|
publish paused or resumed event.
|