Immediate callback if wait time is zero, length getter for LockQueue

bobrik · Jun 14, 2012 · bbad2ac · bbad2ac
1 parent bf303ab
commit bbad2ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/Lock.js b/lib/Lock.js
@@ -18,6 +18,11 @@
             return true;
         }
 
+        self.queue = self.manager.getQueue(self.getName());
+        if (wait == 0 && self.queue.length) {
+            return callback(new Error("Lock already acquired for " + self.getName()));
+        }
+
         self.waitTimer = setTimeout(function() {
             if (!self.acquired) {
                 self.release();
@@ -28,7 +33,6 @@
             self.waitTimer = undefined;
         }, wait);
 
-        self.queue = self.manager.getQueue(self.getName());
         self.queue.push(self, function(error) {
             if (self.waitTimer) {
                 clearTimeout(self.waitTimer);

diff --git a/lib/LockQueue.js b/lib/LockQueue.js
@@ -1,7 +1,13 @@
 (function(module) {
     function LockQueue(name) {
-        this.name  = name;
-        this.queue = [];
+        var self = this;
+
+        self.name  = name;
+        self.queue = [];
+
+        self.__defineGetter__("length", function() {
+            return self.queue.length;
+        });
     };
 
     LockQueue.prototype.getName = function() {