cloudcms-server 3.2.307 → 3.2.309

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);
             // }
         };
     
@@ -88,7 +88,7 @@ exports = module.exports = function()
         provider.lock(key, function(err, _releaseFn) {
             
             if (err) {
-                console.log("[LOCK: " + key + "] err: ", err);
+                //console.log("[LOCK: " + key + "] err: ", err);
                 try { _releaseFn(); } catch (e) { }
                 return fn(err);
             }

package/middleware/cloudcms/cloudcms.js

@@ -414,11 +414,6 @@ exports = module.exports = function()
         });
     };
 
-    var _LOCK = function(cacheKey, workFunction)
-    {
-        process.locks.lock("branchload-" + cacheKey, workFunction);
-    };
-
     // store a cache of branches since we don't want to reload these every time
     var CACHED_BRANCHES = {};
 
@@ -1426,9 +1421,9 @@ exports = module.exports = function()
     
                     cloudcmsUtil.preview(contentStore, gitana, repositoryId, branchId, nodeId, nodePath, attachmentId, locale, previewId, size, mimetype, forceReload, function(err, filePath, cacheInfo, releaseLock) {
 
-                        if (err) {
-                            req.log("Error on preview node: " + err.message + ", err: " + JSON.stringify(err));
-                        }
+                        // if (err) {
+                        //     req.log("Error on preview node: " + err.message + ", err: " + JSON.stringify(err));
+                        // }
 
                         // if the file was found on disk or was downloaded, then stream it back
                         if (!err && filePath && cacheInfo)
@@ -1481,7 +1476,6 @@ exports = module.exports = function()
 
                             releaseLock();
                         }
-
                     });
                 }
                 else

package/middleware/virtual-config/virtual-config.js

@@ -147,11 +147,6 @@ exports = module.exports = function()
         }
     };
 
-    // var _LOCK = function(lockKey, workFunction)
-    // {
-    //     process.locks.lock(lockKey, workFunction);
-    // };
-
     var r = {};
 
     /**

package/package.json

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

package/util/cloudcms.js

@@ -710,7 +710,7 @@ exports = module.exports = function()
 
                         if (err) {
                             
-                            if (err.code === 404) {
+                            if (err.status === 404) {
                                 return callback();
                             }
 

package/util/request.js

@@ -1,9 +1,11 @@
 var axios = require("axios");
+var http = require("http");
+var https = require("https");
 
-// var http = require("http");
-// var https = require("https");
-//
-// var FormData = require("form-data");
+var client = axios.create({
+    "httpAgent": http.globalAgent,
+    "httpsAgent": https.globalAgent
+});
 
 /**
  * Incoming config:
@@ -127,7 +129,7 @@ module.exports = function(config, callback)
     }
     */
     
-    return axios.request(requestConfig).then(function(response) {
+    return client.request(requestConfig).then(function(response) {
         callback(null, response, response.data);
     }, function(error) {
         callback(error);