cloudcms-server 3.2.280 → 3.2.283

package/index.js

@@ -48,48 +48,6 @@ if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
     }
 }
 
-// default agents
-var HttpKeepAliveAgent = require('agentkeepalive');
-var HttpsKeepAliveAgent = require('agentkeepalive').HttpsAgent;
-http.globalAgent = new HttpKeepAliveAgent({
-    keepAlive: true,
-    keepAliveMsecs: 1000,
-    maxSockets: 16000,
-    maxFreeSockets: 256,
-    timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 30000
-});
-https.globalAgent = new HttpsKeepAliveAgent({
-    keepAlive: true,
-    keepAliveMsecs: 1000,
-    maxSockets: 16000,
-    maxFreeSockets: 256,
-    timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 30000
-});
-
-// disable for now
-/*
-// report http/https socket state every minute
-var socketReportFn = function()
-{
-    setTimeout(function() {
-
-        var http = require("http");
-        var https = require("https");
-
-        process.log("--- START SOCKET REPORT ---");
-        process.log("[http]: " + JSON.stringify(http.globalAgent.getCurrentStatus(), null, "  "));
-        process.log("[https]:" + JSON.stringify(https.globalAgent.getCurrentStatus(), null, "  "));
-        process.log("--- END SOCKET REPORT ---");
-
-        socketReportFn();
-
-    }, 60 * 1000);
-};
-socketReportFn();
-*/
-
 // root ssl ca's
 require("ssl-root-cas").inject();
 

package/locks/locks.js

@@ -85,6 +85,12 @@ exports = module.exports = function()
         __log(key, "request");
         provider.lock(key, function(err, _releaseFn) {
             
+            if (err) {
+                console.log("[LOCK: " + key + "] err: ", err);
+                try { _releaseFn(); } catch (e) { }
+                return fn(err);
+            }
+            
             // wrap the releaseFn with a wrapper that can only fire once
             var releaseFn = function(_releaseFn)
             {

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.280",
+  "version": "3.2.283",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,7 +16,6 @@
     "@socket.io/redis-adapter": "^7.2.0",
     "@socket.io/sticky": "^1.0.1",
     "accepts": "^1.3.8",
-    "agentkeepalive": "^4.2.1",
     "alpaca": "^1.5.27",
     "archiver": "^1.3.0",
     "async": "^3.2.3",
@@ -88,7 +87,6 @@
     "stomp-client": "^0.9.0",
     "targz": "^1.0.1",
     "temp": "^0.8.3",
-    "toobusy-js": "^0.5.1",
     "uuid": "^3.3.2",
     "vm2": "^3.8.4",
     "watch": "^0.13.0",

package/server/index.js

@@ -40,10 +40,6 @@ var coreHelpers = require("../duster/helpers/core/index");
 
 var helmet = require("helmet");
 
-var toobusy = require("toobusy-js");
-toobusy.maxLag(500); // 500 ms lag in event queue, quite high but usable for now
-toobusy.interval(250);
-
 var responseTime = require("response-time");
 
 // safely checks for the existence of a path
@@ -890,15 +886,6 @@ var startServer = function(config, startServerFinishedFn)
                 });
                 */
     
-                // middleware which blocks requests when we're too busy
-                app.use(function(req, res, next) {
-                    if (toobusy()) {
-                        res.status(503).send("The web application is too busy to serve this request.  Please try again.");
-                    } else {
-                        next();
-                    }
-                });
-    
                 // add req.id  re
                 app.use(function (req, res, next) {
                     requestCounter++;
@@ -1313,21 +1300,6 @@ var configureServer = function(config, app, httpServer, configureServerFinishedF
                         console.log("Server.close produced error: " + JSON.stringify(e));
                     }
                     
-                    // ask toobusy to shut down as cleanly as we can
-                    if (cluster.isMaster)
-                    {
-                        console.log(" -> Closing toobusy monitor");
-                    }
-                    
-                    try
-                    {
-                        toobusy.shutdown();
-                    }
-                    catch (e)
-                    {
-                        console.log("toobusy.shutdown produced error: " + JSON.stringify(e));
-                    }
-                    
                     if (cluster.isMaster)
                     {
                         console.log("");

package/util/proxy-factory.js

@@ -30,6 +30,7 @@ var acquireProxyHandler = exports.acquireProxyHandler = function(proxyTarget, pa
     // is it already in LRU cache?
     // if so hand it back
     var _cachedHandler = NAMED_PROXY_HANDLERS_CACHE[name];
+    _cachedHandler = null;
     if (_cachedHandler)
     {
         return callback(null, _cachedHandler);
@@ -40,12 +41,15 @@ var acquireProxyHandler = exports.acquireProxyHandler = function(proxyTarget, pa
         
         if (err)
         {
+            console.log("Failed to acquire proxy handler: " + name + ", err: ", err);
+            
             // failed to acquire lock
             return callback(err);
         }
 
         // second check to make sure another thread didn't create the handler in the meantime
         _cachedHandler = NAMED_PROXY_HANDLERS_CACHE[name];
+        _cachedHandler = null;
         if (_cachedHandler)
         {
             releaseLockFn();
@@ -53,6 +57,7 @@ var acquireProxyHandler = exports.acquireProxyHandler = function(proxyTarget, pa
         }
 
         // create the proxy handler and cache it into LRU cache
+        console.log("Acquiring proxy handler: " + name + ", for target: " + proxyTarget + " and prefix: " + pathPrefix);
         _cachedHandler = createProxyHandler(proxyTarget, pathPrefix);
     
         // store back into LRU cache
@@ -270,78 +275,6 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
     
     
     // cookie domain rewrite?
-    
-    // // if we're using auth credentials that are picked up in SSO chain, then we listen for a 401
-    // // and if we hear it, we automatically invalidate the SSO chain so that the next request
-    // // will continue to work
-    // proxyServer.on("proxyRes", function (proxyRes, req, res) {
-    //
-    //     console.log("proxyRes.1");
-    //
-    //     if (req.gitana_user)
-    //     {
-    //         var chunks = [];
-    //         // triggers on data receive
-    //         proxyRes.on('data', function(chunk) {
-    //             // add received chunk to chunks array
-    //             chunks.push(chunk);
-    //         });
-    //
-    //         proxyRes.on("end", function () {
-    //
-    //             console.log("proxyRes.end, code: " + proxyRes.statusCode);
-    //
-    //             if (proxyRes.statusCode === 401)
-    //             {
-    //                 var text = "" + Buffer.concat(chunks);
-    //                 if (text && (text.indexOf("invalid_token") > -1) || (text.indexOf("invalid_grant") > -1))
-    //                 {
-    //                     var identifier = req.identity_properties.provider_id + "/" + req.identity_properties.user_identifier;
-    //
-    //                     _LOCK([identifier], function(err, releaseLockFn) {
-    //
-    //                         if (err)
-    //                         {
-    //                             // failed to acquire lock
-    //                             console.log("FAILED TO ACQUIRE LOCK", err);
-    //                             req.log("FAILED TO ACQUIRE LOCK", err);
-    //                             return;
-    //                         }
-    //
-    //                         var cleanup = function (full)
-    //                         {
-    //                             delete Gitana.APPS[req.identity_properties.token];
-    //                             delete Gitana.PLATFORM_CACHE[req.identity_properties.token];
-    //
-    //                             if (full) {
-    //                                 auth.removeUserCacheEntry(identifier);
-    //                             }
-    //                         };
-    //
-    //                         // null out the access token
-    //                         // this will force the refresh token to be used to get a new one on the next request
-    //                         req.gitana_user.getDriver().http.refresh(function (err) {
-    //
-    //                             if (err) {
-    //                                 cleanup(true);
-    //                                 req.log("Invalidated auth state for gitana user: " + req.identity_properties.token);
-    //                                 releaseLockFn();
-    //                                 return;
-    //                             }
-    //
-    //                             req.gitana_user.getDriver().reloadAuthInfo(function () {
-    //                                 cleanup(true);
-    //                                 req.log("Refreshed token for gitana user: " + req.identity_properties.token);
-    //                                 releaseLockFn();
-    //                             });
-    //                         });
-    //                     });
-    //                 }
-    //
-    //             }
-    //         });
-    //     }
-    // });
 
     return proxyRequestHandler;
 };