summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Shaw <ryanshaw@unc.edu>2012-04-07 17:19:10 -0400
committerCaolan McMahon <caolan@caolanmcmahon.com>2014-03-28 16:35:57 +0000
commitfb8a0ed14fedd36e3e2e47b4f950cd5259f02f81 (patch)
treece49845e8c70b9f8ff7d14a794ba96ad3becd7d1
parent34d643fd6051f4b02cea6724ee0fcf711632dd77 (diff)
downloadasync-fb8a0ed14fedd36e3e2e47b4f950cd5259f02f81.tar.gz
Bugfix: sending saturated event should respect current concurrency.
-rwxr-xr-xlib/async.js2
-rwxr-xr-xtest/test-async.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/async.js b/lib/async.js
index 04f7246..312e645 100755
--- a/lib/async.js
+++ b/lib/async.js
@@ -709,7 +709,7 @@
q.tasks.push(item);
}
- if (q.saturated && q.tasks.length === concurrency) {
+ if (q.saturated && q.tasks.length === q.concurrency) {
q.saturated();
}
async.setImmediate(q.process);
diff --git a/test/test-async.js b/test/test-async.js
index fdcac5f..518650f 100755
--- a/test/test-async.js
+++ b/test/test-async.js
@@ -2664,7 +2664,8 @@ exports['queue events'] = function(test) {
// nop
calls.push('process ' + task);
async.setImmediate(cb);
- }, 3);
+ }, 10);
+ q.concurrency = 3;
q.saturated = function() {
test.ok(q.length() == 3, 'queue should be saturated now');