Comparing version 4.12.3 to 4.12.4
@@ -0,1 +1,8 @@ | ||
## [4.12.4](https://github.com/OptimalBits/bull/compare/v4.12.3...v4.12.4) (2024-05-15) | ||
### Bug Fixes | ||
* **retry-job:** consider priority ([#2737](https://github.com/OptimalBits/bull/issues/2737)) fixes [#1755](https://github.com/OptimalBits/bull/issues/1755) ([09ce146](https://github.com/OptimalBits/bull/commit/09ce146563871519cda638bafa82ce6af34bdd25)) | ||
## [4.12.3](https://github.com/OptimalBits/bull/compare/v4.12.2...v4.12.3) (2024-05-10) | ||
@@ -2,0 +9,0 @@ |
@@ -24,3 +24,3 @@ 'use strict'; | ||
const commands = require('./commands/'); | ||
const commands = require('./scripts/'); | ||
@@ -149,2 +149,15 @@ /** | ||
const loadCommands = (providedScripts, client) => { | ||
const finalScripts = providedScripts || scripts; | ||
for (const property in finalScripts) { | ||
// Only define the command if not already defined | ||
if (!client[finalScripts[property].name]) { | ||
client.defineCommand(finalScripts[property].name, { | ||
numberOfKeys: finalScripts[property].keys, | ||
lua: finalScripts[property].content | ||
}); | ||
} | ||
} | ||
}; | ||
const lazyClient = redisClientGetter(this, opts, (type, client) => { | ||
@@ -157,3 +170,3 @@ // bubble up Redis error events | ||
if (type === 'client') { | ||
this._initializing = commands(client).then( | ||
this._initializing = (async () => loadCommands(commands, client))().then( | ||
() => { | ||
@@ -160,0 +173,0 @@ debuglog(name + ' queue ready'); |
@@ -112,3 +112,3 @@ /** | ||
]) | ||
.then((code) => { | ||
.then(code => { | ||
if (code < 0) { | ||
@@ -128,6 +128,3 @@ throw scripts.finishedErrors(code, job.id, 'updateProgress'); | ||
return queue.client | ||
.updateData(keys, [ | ||
dataJson | ||
]); | ||
return queue.client.updateData(keys, [dataJson]); | ||
}, | ||
@@ -431,2 +428,3 @@ | ||
queue.keys.paused, | ||
queue.keys['meta-paused'], | ||
queue.keys.priority | ||
@@ -484,3 +482,3 @@ ]; | ||
const keys = _.map( | ||
['active', 'wait', jobId, 'meta-paused', 'paused', 'stalled'], | ||
['active', 'wait', jobId, 'meta-paused', 'paused', 'stalled', 'priority'], | ||
name => { | ||
@@ -487,0 +485,0 @@ return queue.toKey(name); |
{ | ||
"name": "bull", | ||
"version": "4.12.3", | ||
"version": "4.12.4", | ||
"description": "Job manager", | ||
@@ -48,11 +48,15 @@ "engines": { | ||
"expect.js": "^0.3.1", | ||
"fast-glob": "^3.3.2", | ||
"husky": "^4.2.5", | ||
"istanbul": "^0.4.5", | ||
"lint-staged": "^8.2.1", | ||
"minimatch": "^7.4.4", | ||
"mocha": "^8.1.1", | ||
"mocha-lcov-reporter": "^1.3.0", | ||
"moment": "^2.24.0", | ||
"npm-run-all": "^4.1.5", | ||
"nyc": "^15.1.0", | ||
"p-reflect": "^1.0.0", | ||
"prettier": "^1.19.1", | ||
"rimraf": "^3.0.2", | ||
"semantic-release": "^17.4.2", | ||
@@ -62,5 +66,8 @@ "sinon": "^7.5.0" | ||
"scripts": { | ||
"clean:scripts": "rimraf rawScripts lib/scripts", | ||
"dc:up": "docker-compose -f docker-compose.yml up -d", | ||
"dc:down": "docker-compose -f docker-compose.yml down", | ||
"pretest": "npm run lint", | ||
"dry-run": "npm publish --dry-run", | ||
"generate:raw:scripts": "node generateRawScripts.js", | ||
"pretest": "npm-run-all clean:scripts generate:raw:scripts transform:commands lint", | ||
"lint": "eslint lib test *.js", | ||
@@ -73,3 +80,4 @@ "test": "NODE_ENV=test nyc mocha -- 'test/test_*' --recursive --exit", | ||
"precommit": "lint-staged", | ||
"build": "tsc" | ||
"build": "tsc", | ||
"transform:commands": "node ./commandTransform.js ./rawScripts ./lib/scripts" | ||
}, | ||
@@ -76,0 +84,0 @@ "lint-staged": { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
284934
70
5859
2
30