cloudcms-server 3.2.319 → 3.2.321

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/middleware/virtual-config/virtual-config.js

@@ -327,7 +327,7 @@ exports = module.exports = function()
                 }
             });
 
-        });
+        }((host, rootStore, logMethod, callback)));
     };
 
     r.interceptor = function()

package/package.json

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

package/server/index.js

@@ -1004,16 +1004,17 @@ var startServer = function(config, startServerFinishedFn)
 
                         if (kill)
                         {
-                            // console.log("KILL, method: " + req.method + ", url: " + req.url);
-                            // if (req.headers)
-                            // {
-                            //     console.log(" -> headers: " + JSON.stringify(req.headers, null, 2));
-                            // }
-                            // if (req.query)
-                            // {
-                            //     console.log(" -> query: " + JSON.stringify(req.query, null, 2));
-                            // }
-                            //
+                            var text = "KILL, method: " + req.method + ", url: " + req.url;
+                            if (req.headers)
+                            {
+                                text += ", headers: " + JSON.stringify(req.headers);
+                            }
+                            if (req.query)
+                            {
+                                text += ", query: " + JSON.stringify(req.query);
+                            }
+                            console.log(text);
+
                             // are we being spoofed? kill the connection
                             res.blocked = true;
                             res.writeHead(503, { 'Content-Type': 'application/json' });

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);
     };
 };