cloudcms-server 3.2.345 → 3.2.347

package/index.js

@@ -60,27 +60,38 @@ process.logInfo = process.log = function(text, level)
 // by default, set up Gitana driver so that it limits to five concurrent HTTP requests back to Cloud CMS API at at time
 var Gitana = require("gitana");
 
-// default keep alive (3 minutes)
-process.defaultKeepAliveMs = (3 * 60 * 1000);
-
 // default http timeout (10 minutes)
 process.defaultHttpTimeoutMs = 10 * 60 * 1000;
-
-// default exclusive lock timeout (2 minutes)
-process.defaultExclusiveLockTimeoutMs = 2 * 60 * 1000;
-
 if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
 {
-    try
-    {
+    try {
         process.defaultHttpTimeoutMs = parseInt(process.env.DEFAULT_HTTP_TIMEOUT_MS);
-    }
-    catch (e)
-    {
+    } catch (e) { }
+}
 
-    }
+// default keep alive (3 minutes)
+process.defaultKeepAliveMs = (3 * 60 * 1000);
+f (process.env.DEFAULT_KEEP_ALIVE_MS)
+{
+    try {
+        process.defaultKeepAliveMs = parseInt(process.env.DEFAULT_KEEP_ALIVE_MS);
+    } catch (e) { }
+}
+
+// default exclusive lock timeout (2 minutes)
+process.defaultExclusiveLockTimeoutMs = 2 * 60 * 1000;
+f (process.env.DEFAULT_EXCLUSIVE_LOCK_TIMEOUT_MS)
+{
+    try {
+        process.defaultExclusiveLockTimeoutMs = parseInt(process.env.DEFAULT_EXCLUSIVE_LOCK_TIMEOUT_MS);
+    } catch (e) { }
 }
 
+// some reporting
+console.log("process.defaultHttpTimeoutMs: " + process.defaultHttpTimeoutMs);
+console.log("process.defaultKeepAliveMs: " + process.defaultKeepAliveMs);
+console.log("process.defaultExclusiveLockTimeoutMs: " + process.defaultExclusiveLockTimeoutMs);
+
 // dns fix for Node 17 +
 // see: https://nodejs.org/api/dns.html#dnssetdefaultresultorderorder
 var dns = require("dns");

package/package.json

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

package/server/index.js

@@ -1218,11 +1218,12 @@ var createHttpServer = function(app, done)
     }
     
     // request timeout
-    var requestTimeoutMs = process.defaultHttpTimeoutMs;
-    if (process.configuration && process.configuration.timeout)
-    {
-        requestTimeoutMs = process.configuration.timeout;
-    }
+    // var requestTimeoutMs = serverConfig.requestTimeout;
+    // if (process.configuration && process.configuration.timeout)
+    // {
+    //     requestTimeoutMs = process.configuration.timeout;
+    // }
+    var requestTimeoutMs = serverConfig.requestTimeout;
     httpServer.setTimeout(requestTimeoutMs, function(socket) {
         console.log("A1: Request Timeout: " + requestTimeoutMs);
         try { socket.end(); } catch (e) { }