Comparing version 3.3.1 to 3.3.2
@@ -0,1 +1,9 @@ | ||
v.3.3.2 | ||
======= | ||
- Fixed #721. SyntaxError: Unexpected token u in JSON at position 0. | ||
- Fixed #739. childs are not added to the retained set. | ||
- Fixed #734. fixed Promise warnings. | ||
[Changes](https://github.com/OptimalBits/bull/compare/v3.3.1...v3.3.2) | ||
v.3.3.1 | ||
@@ -2,0 +10,0 @@ ======= |
@@ -354,3 +354,3 @@ /*eslint-env node */ | ||
} else { | ||
return job.returnvalue; | ||
return job.returnvalue; | ||
} | ||
@@ -363,8 +363,10 @@ }); | ||
if(String(jobId) === String(_this.id)){ | ||
var result = undefined; | ||
var result = void 0; | ||
try{ | ||
result = JSON.parse(resultValue); | ||
}catch (e){ | ||
if(typeof resultValue === 'string'){ | ||
result = JSON.parse(resultValue); | ||
} | ||
}catch (err){ | ||
//swallow exception because the resultValue got corrupted somehow. | ||
debuglog('corrupted resultValue: ' + resultValue, e); | ||
debuglog('corrupted resultValue: ' + resultValue, err); | ||
} | ||
@@ -404,3 +406,3 @@ resolve(result); | ||
} else { | ||
resolve(job.returnvalue); | ||
resolve(job.returnvalue); | ||
} | ||
@@ -482,4 +484,7 @@ }); | ||
job.stacktrace = getTraces(json.stacktrace); | ||
job.returnvalue = getReturnValue(json.returnvalue); | ||
if(typeof json.returnvalue === 'string'){ | ||
job.returnvalue = getReturnValue(json.returnvalue); | ||
} | ||
return job; | ||
@@ -486,0 +491,0 @@ }; |
@@ -26,3 +26,3 @@ 'use strict'; | ||
retained[child.id]; | ||
retained[child.id] = child; | ||
@@ -73,2 +73,5 @@ child.on('exit', function(code, signal){ | ||
}; | ||
this.retained = retained; | ||
this.free = free; | ||
}; |
@@ -680,3 +680,3 @@ /*eslint-env node */ | ||
}).then(function(){ | ||
_this.emit('paused'); | ||
return _this.emit('paused'); | ||
}); | ||
@@ -737,2 +737,3 @@ }; | ||
var delayUpdate = function(){ | ||
_this.delayedTimestamp = Number.MAX_VALUE; | ||
scripts.updateDelaySet(_this, _this.delayedTimestamp).then(function(nextTimestamp){ | ||
@@ -744,7 +745,6 @@ if(nextTimestamp){ | ||
} | ||
_this.updateDelayTimer(nextTimestamp); | ||
return _this.updateDelayTimer(nextTimestamp); | ||
}).catch(function(err){ | ||
_this.emit('error', err, 'Error updating the delay timer'); | ||
}).return(null); | ||
_this.delayedTimestamp = Number.MAX_VALUE; | ||
}; | ||
@@ -755,5 +755,6 @@ | ||
} else { | ||
this.delayTimer = delayUpdate(); | ||
delayUpdate(); | ||
} | ||
} | ||
return null; | ||
}; | ||
@@ -819,2 +820,4 @@ | ||
}, _this.settings.retryProcessDelay); | ||
return null; | ||
}); | ||
@@ -950,2 +953,3 @@ }).catch(function(err){ | ||
_this.emit('drained'); | ||
return null; | ||
} | ||
@@ -952,0 +956,0 @@ }); |
@@ -128,3 +128,3 @@ /** | ||
propVal, | ||
val, | ||
_.isUndefined(val) ? 'null' : val, | ||
ignoreLock ? '0' : job.queue.token, | ||
@@ -131,0 +131,0 @@ shouldRemove ? '1' : '0', |
{ | ||
"name": "bull", | ||
"version": "3.3.1", | ||
"version": "3.3.2", | ||
"description": "Job manager", | ||
"main": "./lib/queue", | ||
"main": "./index.js", | ||
"repository": { | ||
@@ -7,0 +7,0 @@ "type": "git", |
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
465194
59
2681