cloudcms-server 3.2.318 → 3.2.320

package/locks/providers/memory.js

@@ -22,11 +22,11 @@ exports = module.exports = function(lockConfig)
     {
         lock.acquire(key, function(releaseCallbackFn) {
             fn(null, releaseCallbackFn);
-        }, function(err, ret) {
+        }, function(err, value) {
+            // lock was released
             if (err) {
-                console.error("Memory Lock heard error: ", err, " return value: ", ret);
+                console.error("Memory Lock heard error: ", err, " return value: ", value);
             }
-            fn(err);
         });
     };
 

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.318",
+  "version": "3.2.320",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"

package/temp/clusterlock/index.js

@@ -35,10 +35,10 @@ var _setup = function() {
                 };
 
                 _sendMessageToWorker(message);
-            }, function(err, ret) {
+            }, function(err, value) {
                 // lock was released
-                if (err) {
-                    console.error("Cluster Lock heard error: ", err, " return value: ", ret);
+                if (value) {
+                    console.error("Cluster Lock heard error: ", err, " return value: ", value);
                 }
             });
         };

package/util/loaders.js

@@ -94,11 +94,11 @@ var exclusive = exports.exclusive = function(loader, key, timeout)
                 }, 0);
                 callback.call(this, err, value);
             });
-        }, function(err, ret) {
+        }, function(err, value) {
+            // lock was released
             if (err) {
-                console.error("Loaders async lock acquire heard error: ", err, " return value: ", ret);
+                console.error("Failed to acquire lock for key: " + key + ", error: ", err, " return value: ", value);
             }
-            callback.call(this, err, ret);
         }, opts);
     };
 };

package/util/workqueue.js

@@ -1,6 +1,4 @@
-var exports = module.exports;
-
-exports = function(maxSize)
+module.exports = function(maxSize)
 {
     if (!maxSize) {
         maxSize = 3;