cloudcms-server 3.2.330 → 3.2.331

package/index.js

@@ -49,7 +49,7 @@ var debugMiddleware = process.debugMiddleware = function(message)
 {
     return function(req, res, next)
     {
-        debugLog(req, message);
+        //debugLog(req, message);
 
         next();
     }

package/middleware/virtual-config/virtual-config.js

@@ -167,9 +167,9 @@ exports = module.exports = function()
         console.log("[acquireGitanaJson] host: " + host + " - t1");
 
         // so that only N number of virtual configs are loaded at a time
-        enqueueLoadVirtualConfig(function(host, rootStore, logMethod, callback) {
+        var workFn = function(host, rootStore, logMethod) {
 
-            return function()
+            return function(done)
             {
                 console.log("[acquireGitanaJson] host: " + host + " - t2");
 
@@ -277,7 +277,7 @@ exports = module.exports = function()
                             if (err)
                             {
                                 console.log("[acquireGitanaJson] host: " + host + " - t5");
-                                return callback(err);
+                                return done(err);
                             }
 
                             console.log("[acquireGitanaJson] host: " + host + " - t6: " + data);
@@ -286,7 +286,7 @@ exports = module.exports = function()
                             {
                                 console.log("[acquireGitanaJson] host: " + host + " - t7");
 
-                                return callback({
+                                return done({
                                     "message": "The gitana.json data read from disk was null or empty"
                                 })
                             }
@@ -297,7 +297,7 @@ exports = module.exports = function()
                                 if (err)
                                 {
                                     console.log("[acquireGitanaJson] host: " + host + " - t8");
-                                    return callback(err);
+                                    return done(err);
                                 }
 
                                 console.log("[acquireGitanaJson] host: " + host + " - t9");
@@ -307,7 +307,7 @@ exports = module.exports = function()
                                 {
                                     console.log("[acquireGitanaJson] host: " + host + " - t10");
                                     return rootStore.deleteFile("gitana.json", function() {
-                                        callback({
+                                        done({
                                             "message": "There was a problem writing the driver configuration file.  Please reload."
                                         });
                                     });
@@ -340,20 +340,24 @@ exports = module.exports = function()
                                 console.log("[acquireGitanaJson] host: " + host + " - t20: " + JSON.stringify(gitanaJson, null, 2));
 
                                 // otherwise, fine!
-                                callback(null, gitanaJson);
+                                done(null, gitanaJson);
                             });
                         });
                     }
                     else
                     {
                         loadFromRemote(function(err, gitanaJson, doesNotExist) {
-                            callback(err, gitanaJson, doesNotExist);
+                            done(err, gitanaJson, doesNotExist);
                         });
                     }
                 });
             }
 
-        }(host, rootStore, logMethod, callback));
+        }(host, rootStore, logMethod);
+
+        enqueueLoadVirtualConfig(workFn, function(err) {
+            callback(err);
+        });
     };
 
     r.interceptor = function()

package/package.json

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

package/server/index.js

@@ -1261,7 +1261,7 @@ var createHttpServer = function(app, done)
     // socket
     httpServer.on("connection", function (socket) {
 
-        console.log("[SOCKET CONNECTION] " + socket);
+        //console.log("[SOCKET CONNECTION] " + socket);
 
         socket.setNoDelay(true);
         

package/util/workqueue.js

@@ -6,7 +6,7 @@ module.exports = function(maxSize)
 
     var blockExecution = false;
 
-    var pendingWorkFns = [];
+    var pendingWorkQueue = [];
     var activeCount = 0;
 
     var processWork = function () {
@@ -24,7 +24,7 @@ module.exports = function(maxSize)
         do
         {
             // if nothing to work on, bail
-            if (pendingWorkFns.length === 0)
+            if (pendingWorkQueue.length === 0)
             {
                 process = false;
             }
@@ -43,21 +43,34 @@ module.exports = function(maxSize)
                 console.log("Active work items: " + activeCount);
 
                 // define execution function and splice/bind to 0th element from pending list
-                var executionFn = function(workFn) {
+                var executionFn = function(work) {
                     return function() {
-                        workFn(function () {
+                        var workFn = work.workFn;
+                        var callbackFn = work.callbackFn;
+
+                        console.log("[WORKQUEUE - queue: " + pendingWorkQueue.length + ", actives: " + activeCount + "] start work");
+
+                        workFn(function(err) {
 
                             // decrement active count
                             activeCount--;
 
-                            console.log("Active work items: " + activeCount);
+                            console.log("[WORKQUEUE - queue: " + pendingWorkQueue.length + ", actives: " + activeCount + "] finish work");
+
+                            // fire optional callback
+                            if (callbackFn) {
+                                console.log("[WORKQUEUE - queue: " + pendingWorkQueue.length + ", actives: " + activeCount + "] fire work callback");
+                                window.setTimeout(function() {
+                                    callbackFn(err);
+                                });
+                            }
 
                             // process more work on timeout
                             window.setTimeout(processWork);
                         });
 
                     };
-                }(pendingWorkFns.splice(0, 1)[0]);
+                }(pendingWorkQueue.splice(0, 1)[0]);
 
                 // execute on timeout
                 window.setTimeout(executionFn);
@@ -68,10 +81,19 @@ module.exports = function(maxSize)
         blockExecution = false;
     };
 
-    return function(workFn) {
-        pendingWorkFns.push(workFn);
+    return function(workFn, callbackFn) {
+
+        var pendingWork = {
+            "workFn": workFn
+        };
+
+        if (callbackFn) {
+            pendingWork.callbackFn = callbackFn;
+        }
+
+        pendingWorkQueue.push(pendingWork);
 
-        console.log("PENDING WORK FUNCTIONS: " + pendingWorkFns.length);
+        console.log("PENDING WORK FUNCTIONS: " + pendingWorkQueue.length);
 
         // execute on timeout
         window.setTimeout(processWork);