cloudcms-server 3.2.343 → 3.2.345

package/index.js

@@ -63,8 +63,8 @@ var Gitana = require("gitana");
 // default keep alive (3 minutes)
 process.defaultKeepAliveMs = (3 * 60 * 1000);
 
-// default http timeout (2 minutes)
-process.defaultHttpTimeoutMs = 2 * 60 * 1000;
+// default http timeout (10 minutes)
+process.defaultHttpTimeoutMs = 10 * 60 * 1000;
 
 // default exclusive lock timeout (2 minutes)
 process.defaultExclusiveLockTimeoutMs = 2 * 60 * 1000;
@@ -94,18 +94,18 @@ var HttpsKeepAliveAgent = require('agentkeepalive').HttpsAgent;
 http.globalAgent = new HttpKeepAliveAgent({
     keepAlive: true,
     keepAliveMsecs: process.defaultKeepAliveMs,
-    maxSockets: 1024,
-    maxFreeSockets: 256,
+    maxSockets: 2048,
+    maxFreeSockets: 64,
     timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 5000
+    freeSocketTimeout: 30000
 });
 https.globalAgent = new HttpsKeepAliveAgent({
     keepAlive: true,
     keepAliveMsecs: process.defaultKeepAliveMs,
-    maxSockets: 1024,
-    maxFreeSockets: 256,
+    maxSockets: 2048,
+    maxFreeSockets: 64,
     timeout: process.defaultHttpTimeoutMs,
-    freeSocketTimeout: 5000
+    freeSocketTimeout: 30000
 });
 
 // install dns cache

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.343",
+  "version": "3.2.345",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,7 +16,7 @@
     "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/sticky": "^1.0.4",
     "accepts": "^1.3.8",
-    "agentkeepalive": "^4.5.0",
+    "agentkeepalive": "^4.6.0",
     "alpaca": "^1.5.27",
     "archiver": "^7.0.1",
     "async": "^3.2.6",

package/server/index.js

@@ -1188,7 +1188,17 @@ var createHttpServer = function(app, done)
 {
     // create the server (either HTTP or HTTPS)
     var httpServer = null;
-    
+
+    var serverConfig = {};
+    if (process.configuration.https)
+    {
+        for (var k in process.configuration.https) {
+            serverConfig[k] = process.configuration.https[k];
+        }
+    }
+    serverConfig.keepAliveTimeout = process.defaultKeepAliveMs;
+    serverConfig.requestTimeout = process.defaultHttpTimeoutMs;
+
     if (process.configuration.https)
     {
         if (app)
@@ -1196,23 +1206,25 @@ var createHttpServer = function(app, done)
             // configure helmet to support auto-upgrade of http->https
             app.use(helmet());
         }
-            
+
         // create https server
-        httpServer = https.createServer(process.configuration.https, app);
+        httpServer = https.createServer(serverConfig, app);
     }
     else
     {
         // legacy
-        httpServer = http.Server(app);
+        //httpServer = http.Server(app);
+        httpServer = http.createServer(serverConfig, app);
     }
     
     // request timeout
-    var requestTimeout = 120000; // 2 minutes
+    var requestTimeoutMs = process.defaultHttpTimeoutMs;
     if (process.configuration && process.configuration.timeout)
     {
-        requestTimeout = process.configuration.timeout;
+        requestTimeoutMs = process.configuration.timeout;
     }
-    httpServer.setTimeout(requestTimeout, function(socket) {
+    httpServer.setTimeout(requestTimeoutMs, function(socket) {
+        console.log("A1: Request Timeout: " + requestTimeoutMs);
         try { socket.end(); } catch (e) { }
         try { socket.destroy(); } catch (e) { }
     });
@@ -1226,7 +1238,7 @@ var createHttpServer = function(app, done)
 
         socket.setNoDelay(true);
         
-        socket.setTimeout(requestTimeout, function(socket) {
+        socket.setTimeout(requestTimeoutMs, function(socket) {
             try { socket.end(); } catch (e) { }
             try { socket.destroy(); } catch (e) { }
         });

package/util/proxy-factory.js

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