summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Yeates <yeatesgraeme@gmail.com>2016-07-03 17:57:50 -0400
committerGitHub <noreply@github.com>2016-07-03 17:57:50 -0400
commit5d66b2abcf3e68da1f8d397d44a246f7c562a3da (patch)
treec6ed709d5ac30218d95e58112970760484ba33ac
parentab3c5054d0569d09fea69b4f956be44a5d03aa42 (diff)
downloadasync-5d66b2abcf3e68da1f8d397d44a246f7c562a3da.tar.gz
Simplify priorityQueue callback checks
-rw-r--r--lib/priorityQueue.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/priorityQueue.js b/lib/priorityQueue.js
index e895d8b..147a009 100644
--- a/lib/priorityQueue.js
+++ b/lib/priorityQueue.js
@@ -36,7 +36,8 @@ export default function(worker, concurrency) {
// Override push to accept second parameter representing priority
q.push = function(data, priority, callback) {
- if (callback != null && typeof callback !== 'function') {
+ if (callback == null) callback = noop;
+ if (typeof callback !== 'function') {
throw new Error('task callback must be a function');
}
q.started = true;
@@ -59,7 +60,7 @@ export default function(worker, concurrency) {
var item = {
data: task,
priority: priority,
- callback: typeof callback === 'function' ? callback : noop
+ callback: callback
};
if (nextNode) {