cloudcms-server 3.2.328 → 3.2.330

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

@@ -164,13 +164,19 @@ exports = module.exports = function()
 
         var VCSENTINEL_CACHE_KEY = "vcSentinelFailed-" + host;
 
+        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) {
 
             return function()
             {
+                console.log("[acquireGitanaJson] host: " + host + " - t2");
+
                 rootStore.existsFile("gitana.json", function(exists) {
 
+                    console.log("[acquireGitanaJson] host: " + host + " - t3, exists:" + exists);
+
                     var loadFromRemote = function(finishedLoading) {
 
                         // check cache to see if we already tried to load this in the past few minutes and were sorely disappointed
@@ -263,16 +269,23 @@ exports = module.exports = function()
 
                     if (exists)
                     {
+                        console.log("[acquireGitanaJson] host: " + host + " - t4");
+
                         // read gitana json and send back
                         rootStore.readFile("gitana.json", function(err, data) {
 
                             if (err)
                             {
+                                console.log("[acquireGitanaJson] host: " + host + " - t5");
                                 return callback(err);
                             }
 
+                            console.log("[acquireGitanaJson] host: " + host + " - t6: " + data);
+
                             if (!data)
                             {
+                                console.log("[acquireGitanaJson] host: " + host + " - t7");
+
                                 return callback({
                                     "message": "The gitana.json data read from disk was null or empty"
                                 })
@@ -283,12 +296,16 @@ exports = module.exports = function()
 
                                 if (err)
                                 {
+                                    console.log("[acquireGitanaJson] host: " + host + " - t8");
                                     return callback(err);
                                 }
 
+                                console.log("[acquireGitanaJson] host: " + host + " - t9");
+
                                 // if we failed to read stats or file size 0, then delete and call back with error
                                 if (err || stats.size === 0)
                                 {
+                                    console.log("[acquireGitanaJson] host: " + host + " - t10");
                                     return rootStore.deleteFile("gitana.json", function() {
                                         callback({
                                             "message": "There was a problem writing the driver configuration file.  Please reload."
@@ -296,6 +313,8 @@ exports = module.exports = function()
                                     });
                                 }
 
+                                console.log("[acquireGitanaJson] host: " + host + " - t11");
+
                                 // remove vcSentinel if it exists
                                 process.cache.remove(VCSENTINEL_CACHE_KEY);
 
@@ -318,6 +337,8 @@ exports = module.exports = function()
                                     }
                                 }
 
+                                console.log("[acquireGitanaJson] host: " + host + " - t20: " + JSON.stringify(gitanaJson, null, 2));
+
                                 // otherwise, fine!
                                 callback(null, gitanaJson);
                             });

package/package.json

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

package/util/workqueue.js

@@ -40,7 +40,7 @@ module.exports = function(maxSize)
                 // increment active count
                 activeCount++;
 
-                //console.log("Active work items: " + activeCount);
+                console.log("Active work items: " + activeCount);
 
                 // define execution function and splice/bind to 0th element from pending list
                 var executionFn = function(workFn) {
@@ -50,7 +50,7 @@ module.exports = function(maxSize)
                             // decrement active count
                             activeCount--;
 
-                            //console.log("Active work items: " + activeCount);
+                            console.log("Active work items: " + activeCount);
 
                             // process more work on timeout
                             window.setTimeout(processWork);
@@ -71,6 +71,8 @@ module.exports = function(maxSize)
     return function(workFn) {
         pendingWorkFns.push(workFn);
 
+        console.log("PENDING WORK FUNCTIONS: " + pendingWorkFns.length);
+
         // execute on timeout
         window.setTimeout(processWork);
     };