cloudcms-server 3.2.294 → 3.2.296

package/middleware/proxy/proxy.js

@@ -245,6 +245,7 @@ exports = module.exports = function()
                         }
                         
                         proxyFactory.acquireProxyHandler(proxyTarget, null, function(err, proxyHandler) {
+
                             if (err) {
                                 return next(err);
                             }

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "3.2.294",
+  "version": "3.2.296",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -33,6 +33,7 @@
     "consolidate": "^0.14.5",
     "cookie-parser": "^1.4.4",
     "debug": "^2.6.9",
+    "dns-lookup-cache": "^1.0.4",
     "dustjs-helpers": "1.7.4",
     "dustjs-linkedin": "3.0.1",
     "errorhandler": "^1.5.1",

package/util/proxy-factory.js

@@ -9,6 +9,8 @@ var oauth2 = require("./oauth2")();
 
 var LRU = require("lru-cache");
 
+const { lookup } = require('dns-lookup-cache');
+
 var exports = module.exports;
 
 var _LOCK = function(lockIdentifiers, workFunction)
@@ -34,35 +36,39 @@ 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);
+    // // 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);
+    // });
     
-        // 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);
 };
 
 
@@ -238,11 +244,13 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
     {
         return headers;
     };
+    // request invoke settings
+    proxyOptions.request = {};
+    proxyOptions.request.lookup = lookup;
     
     //////////////////////////////////////////////////////////////////////////
     
     var proxyRequestHandler = function(req, res) {
-        
         proxy(req, res, pathPrefix, proxyOptions);
     };