cloudcms-server 3.2.327 → 3.2.329

package/index.js

@@ -29,26 +29,31 @@ process.logInfo = process.log = function(text, level)
     systemLogger.log(text, level);
 };
 
+var debugLog = process.debugLog = function(req, message)
+{
+    var text = "[" + req.id + "] URL: " + req.url;
+    // if (req.headers)
+    // {
+    //     text += ", HEADERS: " + JSON.stringify(req.headers);
+    // }
+    if (req.query)
+    {
+        text += ", QUERY: " + JSON.stringify(req.query);
+    }
+    text += ", MESSAGE: " + message;
+
+    console.log(text);
+};
+
 var debugMiddleware = process.debugMiddleware = function(message)
 {
     return function(req, res, next)
     {
-        var text = "[" + req.id + "] URL: " + req.url;
-        // if (req.headers)
-        // {
-        //     text += ", HEADERS: " + JSON.stringify(req.headers);
-        // }
-        if (req.query)
-        {
-            text += ", QUERY: " + JSON.stringify(req.query);
-        }
-        text += ", MESSAGE: " + message;
-
-        console.log(text);
+        debugLog(req, message);
 
         next();
     }
-}
+};
 
 
 

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

@@ -2,6 +2,8 @@ var util = require("../../util/util");
 
 var workQueueFactory = require("../../util/workqueue");
 
+var debugLog = process.debugLog;
+
 /**
  * Retrieves virtual driver configuration for hosts from Cloud CMS.
  *
@@ -162,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
@@ -261,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"
                                 })
@@ -281,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."
@@ -294,6 +313,8 @@ exports = module.exports = function()
                                     });
                                 }
 
+                                console.log("[acquireGitanaJson] host: " + host + " - t11");
+
                                 // remove vcSentinel if it exists
                                 process.cache.remove(VCSENTINEL_CACHE_KEY);
 
@@ -316,6 +337,8 @@ exports = module.exports = function()
                                     }
                                 }
 
+                                console.log("[acquireGitanaJson] host: " + host + " - t20: " + JSON.stringify(gitanaJson, null, 2));
+
                                 // otherwise, fine!
                                 callback(null, gitanaJson);
                             });
@@ -355,8 +378,11 @@ exports = module.exports = function()
 
             var completionFunction = function (err, gitanaConfig, doesNotExist)
             {
+                debugLog(req, "g20");
                 if (doesNotExist)
                 {
+                    debugLog(req, "g21");
+
                     // console.log("BLOCK, method: " + req.method + ", url: " + req.url);
                     // if (req.headers)
                     // {
@@ -373,6 +399,8 @@ exports = module.exports = function()
                     return res.end(JSON.stringify({"error": true, "message": "Bad Request."}));
                 }
 
+                debugLog(req, "g22");
+
                 if (err)
                 {
                     if (err.message)
@@ -380,11 +408,15 @@ exports = module.exports = function()
                         req.log(err.message);
                     }
 
+                    debugLog(req, "g23: " + err);
+
                     return next();
                 }
 
                 if (gitanaConfig)
                 {
+                    debugLog(req, "g24: " + JSON.stringify(gitanaConfig, null, 2));
+
                     // store config
                     req.gitanaConfig = gitanaConfig;
 
@@ -392,11 +424,18 @@ exports = module.exports = function()
                     req.gitanaLocal = false;
                 }
 
+                debugLog(req, "g30");
+
                 next();
             };
 
+            debugLog(req, "g1: " + req.virtualHost);
+
             process.driverConfigCache.read(req.virtualHost, function(err, cachedValue)
             {
+                debugLog(req, "g2: " + err);
+                debugLog(req, "g3: " + cachedValue);
+
                 if (process.env.NULL_DRIVER_CACHE === "true") {
                     cachedValue = null;
                 }
@@ -405,20 +444,29 @@ exports = module.exports = function()
                 {
                     if (cachedValue === SENTINEL_NOT_FOUND_VALUE)
                     {
+                        debugLog(req, "g4");
+
                         // null means there verifiably isn't anything on disk (null used as sentinel marker)
                         completionFunction(null, null, true);
                     }
                     else
                     {
+                        debugLog(req, "g5");
+
                         // we have something in cache
                         completionFunction(null, cachedValue.config);
                     }
                 }
                 else
                 {
+                    debugLog(req, "g6");
+
                     // try to load from disk
                     acquireGitanaJson(req.virtualHost, req.rootStore, req.log, function (err, gitanaConfig, doesNotExist)
                     {
+                        debugLog(req, "g7: " + err);
+                        debugLog(req, "g8: " + gitanaConfig);
+
                         if (err && !doesNotExist)
                         {
                             return completionFunction(err);
@@ -426,6 +474,8 @@ exports = module.exports = function()
 
                         if (gitanaConfig)
                         {
+                            debugLog(req, "g9: " + JSON.stringify(gitanaConfig, null, 2));
+
                             return process.driverConfigCache.write(req.virtualHost, {
                                 "config": gitanaConfig
                             }, function (err) {
@@ -433,6 +483,8 @@ exports = module.exports = function()
                             });
                         }
 
+                        debugLog(req, "g10: " + req.virtualHost);
+
                         // mark with sentinel (30 minutes)
                         req.log("[BLACKLIST] Adding: " + req.virtualHost);
                         process.driverConfigCache.write(req.virtualHost, SENTINEL_NOT_FOUND_VALUE, BLACKLIST_TTL_SECONDS, function (err) {

package/package.json

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