cloudcms-server 3.2.302 → 3.2.304

package/index.js

@@ -33,8 +33,11 @@ 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 http timeout
-process.defaultHttpTimeoutMs = 60000;
+// default keep alive (3 minutes)
+process.defaultKeepAliveMs = (3 * 60 * 1000);
+
+// default http timeout (2 minutes)
+process.defaultHttpTimeoutMs = 2 * 60 * 1000;
 
 if (process.env.DEFAULT_HTTP_TIMEOUT_MS)
 {

package/locks/locks.js

@@ -80,7 +80,7 @@ exports = module.exports = function()
             // var skip = false;
             // if (key === "channels") { skip = true; }
             // if (!skip) {
-            //     console.log("[LOCK: " + key + "] " + text);
+                 console.log("[LOCK: " + key + "] " + text);
             // }
         };
     

package/middleware/cloudcms/cloudcms.js

@@ -435,72 +435,48 @@ exports = module.exports = function()
             return callback(null, Chain(branch));
         }
 
-        // only allow one "thread" at a time to load the branch
-        _LOCK(cacheKey, function(err, releaseLockFn) {
-            
-            if (err) {
-                return callback(err);
-            }
-    
-            var branch = CACHED_BRANCHES[cacheKey];
-            if (branch) {
-                callback(null, Chain(branch));
-                return releaseLockFn();
-            }
-            
-            var loadFn = function(finished) {
+        var loadFn = function(finished) {
 
-                Chain(repository).trap(function(e) {
+            Chain(repository).trap(function(e) {
 
-                    // unable to load branch!
-                    process.log("Unable to load branch: " + repository._doc + "/" + branchId + ", err: " + e);
-                    process.log(e);
-                    finished({
-                        "message": "Unable to load branch: " + repository._doc + "/" + branchId
-                    });
-                    return false;
-                }).readBranch(branchId).then(function() {
-                    finished(null, this);
+                // unable to load branch!
+                process.log("Unable to load branch: " + repository._doc + "/" + branchId + ", err: " + e);
+                process.log(e);
+                finished({
+                    "message": "Unable to load branch: " + repository._doc + "/" + branchId
                 });
+                return false;
+            }).readBranch(branchId).then(function() {
+                finished(null, this);
+            });
 
-            };
-
-            loadFn(function(err, branch) {
+        };
 
-                if (err || !branch)
-                {
-                    // try again...
-                    return loadFn(function(err, branch) {
+        loadFn(function(err, branch) {
 
-                        if (err) {
+            if (err || !branch)
+            {
+                // try again...
+                return loadFn(function(err, branch) {
 
-                            callback(err);
-                            
-                            // release the lock
-                            return releaseLockFn();
-                        }
+                    if (err) {
+                        return callback(err);
+                    }
 
-                        // success!
+                    // success!
 
-                        // store in cache
-                        CACHED_BRANCHES[cacheKey] = branch;
-    
-                        callback(null, branch);
-                        
-                        // release the lock
-                        return releaseLockFn();
-                    });
-                }
+                    // store in cache
+                    CACHED_BRANCHES[cacheKey] = branch;
 
-                // store in cache
-                CACHED_BRANCHES[cacheKey] = branch;
+                    return callback(null, branch);
+                });
+            }
 
-                // release the lock
-                releaseLockFn();
+            // store in cache
+            CACHED_BRANCHES[cacheKey] = branch;
 
-                // do the callback
-                return callback(null, branch);
-            });
+            // do the callback
+            return callback(null, branch);
         });
     };
 

package/middleware/runtime/runtime.js

@@ -205,9 +205,15 @@ exports = module.exports = function()
                         data.branchId = process.env.CLOUDCMS_RUNTIME_BRANCH_ID;
                     }
 
+                    // don't bother writing if we don't have anything to persist
+                    if (!data.releaseId && !data.branchId)
+                    {
+                        req.runtime = data;
+                        next();
+                    }
+
                     // create runtime file
                     store.writeFile("runtime.json", JSON.stringify(data, null, "  "), function(err) {
-
                         req.runtime = data;
                         next();
                     });

package/package.json

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

package/server/index.js

@@ -1162,16 +1162,24 @@ var createHttpServer = function(app, done)
     }
     
     // request timeout
-    var requestTimeout = 30000; // 30 seconds
+    var requestTimeout = 120000; // 2 minutes
     if (process.configuration && process.configuration.timeout)
     {
         requestTimeout = process.configuration.timeout;
     }
-    httpServer.setTimeout(requestTimeout);
+    httpServer.setTimeout(requestTimeout, function(socket) {
+        try { socket.end(); } catch (e) { }
+        try { socket.destroy(); } catch (e) { }
+    });
     
     // socket
     httpServer.on("connection", function (socket) {
         socket.setNoDelay(true);
+        
+        socket.setTimeout(requestTimeout, function(socket) {
+            try { socket.end(); } catch (e) { }
+            try { socket.destroy(); } catch (e) { }
+        });
     });
     
     done(null, httpServer);

package/util/cloudcms.js

@@ -508,25 +508,12 @@ exports = module.exports = function()
         
                     }
                 });
-                // }).on('error', function (e) {
-                //     failFast(tempStream, e);
-                //
-                // }).on('end', function (e) {
-                //
-                //     // ensure stream is closed
-                //     closeWriteStream(tempStream);
-                //
-                // }).end();
 
                 tempStream.on("error", function (e) {
                     process.log("Temp stream errored out");
                     process.log(e);
     
                     failFast(tempStream, e);
-
-                    // ensure stream is closed
-                    //closeWriteStream(tempStream);
-
                 });
             });
 

package/util/proxy-factory.js

@@ -34,49 +34,24 @@ 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);
-    //
-    //     // store back into LRU cache
-    //     NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
-    //
-    //     releaseLockFn();
-    //     callback(null, _cachedHandler);
-    // });
-    
     _cachedHandler = NAMED_PROXY_HANDLERS_CACHE[name] = createProxyHandler(proxyTarget, pathPrefix);
     
     callback(null, _cachedHandler);
 };
 
 
-
-
 var createProxyHandler = function(proxyTarget, pathPrefix)
 {
     const { proxy, close } = require('fast-proxy')({
         base: proxyTarget,
         cacheURLs: 0,
+        keepAlive: true,
+        keepAliveMsecs: process.defaultKeepAliveMs,
+        maxSockets: 2048,
+        maxFreeSockets: 64,
+        timeout: process.defaultHttpTimeoutMs,
+        freeSocketTimeout: 30000
+
         //http2: true,
         //undici: true
     });

package/.last_command

@@ -1,7 +0,0 @@
-{
-  "command": {
-    "group": "server",
-    "name": "start"
-  },
-  "arguments": {}
-}