cloudcms-server 3.2.306 → 3.2.307

package/index.js

@@ -67,18 +67,18 @@ var HttpsKeepAliveAgent = require('agentkeepalive').HttpsAgent;
 http.globalAgent = new HttpKeepAliveAgent({
     keepAlive: true,
     keepAliveMsecs: process.defaultKeepAliveMs,
-    maxSockets: 24000,
+    maxSockets: 1024,
     maxFreeSockets: 256,
     timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 60000
+    freeSocketTimeout: 5000
 });
 https.globalAgent = new HttpsKeepAliveAgent({
     keepAlive: true,
     keepAliveMsecs: process.defaultKeepAliveMs,
-    maxSockets: 24000,
+    maxSockets: 1024,
     maxFreeSockets: 256,
     timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 60000
+    freeSocketTimeout: 5000
 });
 
 // install dns cache

package/middleware/runtime/runtime.js

@@ -226,10 +226,9 @@ exports = module.exports = function()
             }(store);
 
             // wrap loader with caching + an exclusive lock
-            var cachedLoader = Loaders.cached(loader, process.runtimeCache, key);
-            var exclusiveLoader = Loaders.exclusive(cachedLoader, key, process.defaultExclusiveLockTimeoutMs);
+            var cachedExclusiveLoader = Loaders.cachedExclusive(loader, process.runtimeCache, key, process.defaultExclusiveLockTimeoutMs);
 
-            exclusiveLoader(callback);
+            cachedExclusiveLoader(callback);
         };
 
         return util.createInterceptor("runtime", function(req, res, next, stores, cache, configuration) {

package/package.json

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

package/server/index.js

@@ -785,16 +785,16 @@ var startServer = function(config, startServerFinishedFn)
                 f(req, res, function() {
                     var totalTime = process.hrtime(startTime);
                     var totalTimeMs = (totalTime[1] / 1000000).toFixed(2);
-                    if (totalTimeMs > 100)
-                    {
-                        if (id)
-                        {
-                            console.log("[" + id + "](" + functionName + ") time: " + totalTimeMs);
-                        }
-
-                        //console.trace();
-                        //process.exit(-1);
-                    }
+                    // if (totalTimeMs > 100)
+                    // {
+                    //     if (id)
+                    //     {
+                    //         console.log("[" + id + "](" + functionName + ") time: " + totalTimeMs);
+                    //     }
+                    //
+                    //     //console.trace();
+                    //     //process.exit(-1);
+                    // }
 
                     next();
                 });
@@ -986,7 +986,7 @@ var startServer = function(config, startServerFinishedFn)
                                 message = "\r\n**** SLOW RESPONSE ****\r\n" + message + "\r\n";
                             }
                             */
-    
+
                             console.log(message);
                         };
     

package/util/loaders.js

@@ -22,7 +22,7 @@ var SENTINEL_NOT_FOUND_VALUE = "null";
  * @param cache
  * @param key
  */
-exports.cached = function(loader, cache, key)
+var cached = exports.cached = function(loader, cache, key)
 {
     return function(callback)
     {
@@ -76,7 +76,7 @@ var lock = new AsyncLock();
  * @param loader
  * @param key
  */
-exports.exclusive = function(loader, key, timeout)
+var exclusive = exports.exclusive = function(loader, key, timeout)
 {
     return function(callback)
     {
@@ -97,3 +97,12 @@ exports.exclusive = function(loader, key, timeout)
         }, opts);
     };
 };
+
+var cachedExclusive = exports.cachedExclusive = function(loader, cache, key, timeout)
+{
+    var cachedLoader1 = cached(loader, cache, key);
+    var exclusiveLoader = exclusive(cachedLoader1, key, timeout);
+    var cachedLoader2 = cached(exclusiveLoader, cache, key);
+
+    return cachedLoader2;
+};

package/util/proxy-factory.js

@@ -47,10 +47,10 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
         cacheURLs: 0,
         keepAlive: true,
         keepAliveMsecs: process.defaultKeepAliveMs,
-        maxSockets: 2048,
-        maxFreeSockets: 64,
+        maxSockets: 1024,
+        maxFreeSockets: 256,
         timeout: process.defaultHttpTimeoutMs,
-        freeSocketTimeout: 30000
+        freeSocketTimeout: 5000
 
         //http2: true,
         //undici: true