cloudcms-server 3.2.334 → 3.2.336

package/index.js

@@ -29,31 +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)
-    {
-        //debugLog(req, message);
-
-        next();
-    }
-};
+// 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)
+//     {
+//         debugLog(req, message);
+//
+//         next();
+//     }
+// };
 
 
 
@@ -333,82 +333,43 @@ exports = module.exports = function()
 
     r.common1 = function(app)
     {
-        // DEBUG
-        app.use(debugMiddleware("DEBUG x1"));
-
         // app config interceptor
         applyApplicationConfiguration(app);
 
-        // DEBUG
-        app.use(debugMiddleware("DEBUG x2"));
-
         // sets locale onto the request
         app.use(locale.localeInterceptor());
 
-        // DEBUG
-        app.use(debugMiddleware("DEBUG x3"));
-
         // sets host onto the request
         app.use(host.hostInterceptor());
-
-        // DEBUG
-        app.use(debugMiddleware("DEBUG x4"));
     };
 
     r.common2 = function(app)
     {
-        // DEBUG
-        app.use(debugMiddleware("DEBUG y1"));
-
         // bind stores into the request
         app.use(storeService.storesInterceptor());
 
-        // DEBUG
-        app.use(debugMiddleware("DEBUG y2"));
-
         // puts req.descriptor into the request and req.virtualFiles = true
         app.use(virtualFiles.interceptor());
 
-        // DEBUG
-        app.use(debugMiddleware("DEBUG y3"));
-
         // puts req.runtime into the request
         app.use(runtime.interceptor());
 
-        // DEBUG
-        app.use(debugMiddleware("DEBUG y4"));
-
         // if virtual hosting is enabled, loads "gitana.json" from cloud cms and places it into rootStore
         // for convenience, also populates req.gitanaConfig
         app.use(virtualConfig.interceptor());
 
-        // DEBUG
-        app.use(debugMiddleware("DEBUG y5"));
-
         // general method for finding "gitana.json" in root store and populating req.gitanaConfig
         app.use(driverConfig.interceptor());
-
-        // DEBUG
-        app.use(debugMiddleware("DEBUG y6"));
     };
 
     r.common3 = function(app)
     {
-        // DEBUG
-        app.use(debugMiddleware("DEBUG z1"));
-
         // binds "req.gitana" into the request for the loaded "req.gitanaConfig"
         app.use(driver.driverInterceptor());
-
-        // DEBUG
-        app.use(debugMiddleware("DEBUG z2"));
     };
 
     r.common4 = function(app, includeCloudCMS)
     {
-        // DEBUG
-        app.use(debugMiddleware("DEBUG v1"));
-
         var configuration = app.configuration;
 
         if (includeCloudCMS)
@@ -441,9 +402,6 @@ exports = module.exports = function()
 
         // graphql
         app.use(graphql.interceptor());
-
-        // DEBUG
-        app.use(debugMiddleware("DEBUG v2"));
     };
 
     r.perf1 = function(app)

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

@@ -2,7 +2,7 @@ var util = require("../../util/util");
 
 var workQueueFactory = require("../../util/workqueue");
 
-var debugLog = process.debugLog;
+//var debugLog = process.debugLog;
 
 /**
  * Retrieves virtual driver configuration for hosts from Cloud CMS.
@@ -164,19 +164,13 @@ 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
         var workFn = function(host, rootStore, logMethod) {
 
             return function(done)
             {
-                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
@@ -269,23 +263,16 @@ 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 done(err);
                             }
 
-                            console.log("[acquireGitanaJson] host: " + host + " - t6: " + data);
-
                             if (!data)
                             {
-                                console.log("[acquireGitanaJson] host: " + host + " - t7");
-
                                 return done({
                                     "message": "The gitana.json data read from disk was null or empty"
                                 })
@@ -296,16 +283,12 @@ exports = module.exports = function()
 
                                 if (err)
                                 {
-                                    console.log("[acquireGitanaJson] host: " + host + " - t8");
                                     return done(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() {
                                         done({
                                             "message": "There was a problem writing the driver configuration file.  Please reload."
@@ -313,8 +296,6 @@ exports = module.exports = function()
                                     });
                                 }
 
-                                console.log("[acquireGitanaJson] host: " + host + " - t11");
-
                                 // remove vcSentinel if it exists
                                 process.cache.remove(VCSENTINEL_CACHE_KEY);
 
@@ -337,8 +318,6 @@ exports = module.exports = function()
                                     }
                                 }
 
-                                console.log("[acquireGitanaJson] host: " + host + " - t20: " + JSON.stringify(gitanaJson, null, 2));
-
                                 // otherwise, fine!
                                 done(null, gitanaJson);
                             });
@@ -382,11 +361,8 @@ 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)
                     // {
@@ -403,8 +379,6 @@ exports = module.exports = function()
                     return res.end(JSON.stringify({"error": true, "message": "Bad Request."}));
                 }
 
-                debugLog(req, "g22");
-
                 if (err)
                 {
                     if (err.message)
@@ -412,15 +386,11 @@ 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;
 
@@ -428,18 +398,11 @@ 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;
                 }
@@ -448,29 +411,20 @@ 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);
@@ -478,8 +432,6 @@ exports = module.exports = function()
 
                         if (gitanaConfig)
                         {
-                            debugLog(req, "g9: " + JSON.stringify(gitanaConfig, null, 2));
-
                             return process.driverConfigCache.write(req.virtualHost, {
                                 "config": gitanaConfig
                             }, function (err) {
@@ -487,8 +439,6 @@ 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.334",
+  "version": "3.2.336",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"

package/server/index.js

@@ -729,7 +729,7 @@ var initSession = function(initDone)
     }
 };
 
-var debugMiddleware = process.debugMiddleware;
+//var debugMiddleware = process.debugMiddleware;
 
 var startServer = function(config, startServerFinishedFn)
 {
@@ -899,9 +899,6 @@ var startServer = function(config, startServerFinishedFn)
                     next();
                 });
 
-                // DEBUG
-                app.use(debugMiddleware("DEBUG 1"));
-
                 // APPLY CUSTOM INIT FUNCTIONS
                 runFunctions(config.initFunctions, [app], function (err) {
     
@@ -995,9 +992,6 @@ var startServer = function(config, startServerFinishedFn)
                     // common interceptors and config
                     main.common1(app);
 
-                    // DEBUG
-                    app.use(debugMiddleware("DEBUG 2"));
-
                     // general logging of requests
                     // gather statistics on response time
                     app.use(responseTime(function (req, res, time) {
@@ -1037,28 +1031,16 @@ var startServer = function(config, startServerFinishedFn)
                         req.log(m, warn);
                     }));
 
-                    // DEBUG
-                    app.use(debugMiddleware("DEBUG 2a"));
-
                     // set up CORS allowances
                     // this lets CORS requests float through the proxy
                     app.use(main.ensureCORS());
 
-                    // DEBUG
-                    app.use(debugMiddleware("DEBUG 2b"));
-
                     // set up default security headers
                     app.use(main.ensureHeaders());
 
-                    // DEBUG
-                    app.use(debugMiddleware("DEBUG 2c"));
-
                     // common interceptors and config
                     main.common2(app);
 
-                    // DEBUG
-                    app.use(debugMiddleware("DEBUG 3"));
-
                     // APPLY CUSTOM DRIVER FUNCTIONS
                     runFunctions(config.driverFunctions, [app], function(err) {
     
@@ -1071,9 +1053,6 @@ var startServer = function(config, startServerFinishedFn)
                         // cloudcms things need to run here
                         main.common4(app, true);
 
-                        // DEBUG
-                        app.use(debugMiddleware("DEBUG 4"));
-
                         // APPLY CUSTOM FILTER FUNCTIONS
                         runFunctions(config.filterFunctions, [app], function (err) {
     
@@ -1089,9 +1068,6 @@ var startServer = function(config, startServerFinishedFn)
                             // DEVELOPMENT BASED PERFORMANCE CACHING
                             main.perf3(app);
 
-                            // DEBUG
-                            app.use(debugMiddleware("DEBUG 5"));
-
                             // standard body parsing + a special cloud cms body parser that makes a last ditch effort for anything
                             // that might be JSON (regardless of content type)
                             app.use(function (req, res, next) {
@@ -1114,9 +1090,6 @@ var startServer = function(config, startServerFinishedFn)
                                 app.use(flash());
                             }
 
-                            // DEBUG
-                            app.use(debugMiddleware("DEBUG 6"));
-
                             // this is the same as calling
                             // app.use(passport.initialize());
                             // except we create a new passport each time and store on request to support multitenancy
@@ -1156,9 +1129,6 @@ var startServer = function(config, startServerFinishedFn)
                                 });
                             }
 
-                            // DEBUG
-                            app.use(debugMiddleware("DEBUG 7"));
-
                             // welcome files
                             main.welcome(app);
     
@@ -1170,21 +1140,12 @@ var startServer = function(config, startServerFinishedFn)
                             // healthcheck middleware
                             main.healthcheck(app);
 
-                            // DEBUG
-                            app.use(debugMiddleware("DEBUG 8"));
-
                             // APPLY CUSTOM ROUTES
                             runFunctions(config.routeFunctions, [app], function (err) {
 
-                                // DEBUG
-                                app.use(debugMiddleware("DEBUG 9"));
-
                                 // configure cloudcms app server handlers
                                 main.handlers(app, true);
 
-                                // DEBUG
-                                app.use(debugMiddleware("DEBUG 10"));
-
                                 // register error functions
                                 runFunctions(config.errorFunctions, [app], function (err) {
     

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(work) {
@@ -48,18 +48,18 @@ module.exports = function(maxSize)
                         var workFn = work.workFn;
                         var callbackFn = work.callbackFn;
 
-                        console.log("[WORKQUEUE - queue: " + pendingWorkQueue.length + ", actives: " + activeCount + "] start work");
+                        // console.log("[WORKQUEUE - queue: " + pendingWorkQueue.length + ", actives: " + activeCount + "] start work");
 
                         workFn(function(err, obj1, obj2) {
 
                             // decrement active count
                             activeCount--;
 
-                            console.log("[WORKQUEUE - queue: " + pendingWorkQueue.length + ", actives: " + activeCount + "] finish work");
+                            // 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");
+                                // console.log("[WORKQUEUE - queue: " + pendingWorkQueue.length + ", actives: " + activeCount + "] fire work callback");
                                 window.setTimeout(function() {
                                     callbackFn(err, obj1, obj2);
                                 });
@@ -93,8 +93,6 @@ module.exports = function(maxSize)
 
         pendingWorkQueue.push(pendingWork);
 
-        console.log("PENDING WORK FUNCTIONS: " + pendingWorkQueue.length);
-
         // execute on timeout
         window.setTimeout(processWork);
     };