cloudcms-server 3.2.293 → 3.2.295

package/index.js

@@ -55,6 +55,26 @@ if (typeof(dns.setDefaultResultOrder) !== "undefined") {
     dns.setDefaultResultOrder("ipv4first");
 }
 
+// default agents
+var HttpKeepAliveAgent = require('agentkeepalive');
+var HttpsKeepAliveAgent = require('agentkeepalive').HttpsAgent;
+http.globalAgent = new HttpKeepAliveAgent({
+    keepAlive: true,
+    keepAliveMsecs: 30000,
+    maxSockets: 24000,
+    maxFreeSockets: 256,
+    timeout: process.defaultHttpTimeoutMs,
+    freeSocketTimeout: 60000
+});
+https.globalAgent = new HttpsKeepAliveAgent({
+    keepAlive: true,
+    keepAliveMsecs: 30000,
+    maxSockets: 24000,
+    maxFreeSockets: 256,
+    timeout: process.defaultHttpTimeoutMs,
+    freeSocketTimeout: 60000
+});
+
 // disable for now
 /*
 // report http/https socket state every minute

package/middleware/proxy/proxy.js

@@ -244,7 +244,10 @@ exports = module.exports = function()
                             });
                         }
                         
+                        var t1 = new Date().getTime();
                         proxyFactory.acquireProxyHandler(proxyTarget, null, function(err, proxyHandler) {
+                            var t2 = new Date().getTime();
+                            console.log("t21: " + (t2-t1));
                             if (err) {
                                 return next(err);
                             }

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.293",
+  "version": "3.2.295",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,6 +16,7 @@
     "@socket.io/redis-adapter": "^7.2.0",
     "@socket.io/sticky": "^1.0.1",
     "accepts": "^1.3.8",
+    "agentkeepalive": "^4.5.0",
     "alpaca": "^1.5.27",
     "archiver": "^1.3.0",
     "async": "^3.2.3",

package/util/proxy-factory.js

@@ -34,35 +34,40 @@ var acquireProxyHandler = exports.acquireProxyHandler = function(proxyTarget, pa
         return callback(null, _cachedHandler);
     }
     
-    // take out a thread lock
-    _LOCK(["acquireProxyHandler", name], function(err, releaseLockFn) {
-        
-        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];
-        if (_cachedHandler)
-        {
-            releaseLockFn();
-            return callback(null, _cachedHandler);
-        }
-
-        // 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);
+    // // take out a thread lock
+    // _LOCK(["acquireProxyHandler", name], function(err, releaseLockFn) {
+    //
+    //     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];
+    //     if (_cachedHandler)
+    //     {
+    //         releaseLockFn();
+    //         return callback(null, _cachedHandler);
+    //     }
+    //
+    //     // 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
+    //     NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
+    //
+    //     releaseLockFn();
+    //     callback(null, _cachedHandler);
+    // });
     
-        // store back into LRU cache
-        NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
-
-        releaseLockFn();
-        callback(null, _cachedHandler);
-    });
+    _cachedHandler = createProxyHandler(proxyTarget, pathPrefix);
+    NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
+    
+    callback(null, _cachedHandler);
 };
 
 
@@ -72,11 +77,7 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
 {
     const { proxy, close } = require('fast-proxy')({
         base: proxyTarget,
-        cacheURLs: 1024,
-        keepAliveMsecs: 1000 * 60 * 5, // five minutes
-        maxSockets: 32168,
-        maxFreeSockets: 32168,
-        keepAlive: true,
+        cacheURLs: 0,
         //http2: true,
         //undici: true
     });
@@ -246,7 +247,6 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
     //////////////////////////////////////////////////////////////////////////
     
     var proxyRequestHandler = function(req, res) {
-        
         proxy(req, res, pathPrefix, proxyOptions);
     };