cloudcms-server 3.2.294 → 3.2.295

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/middleware/proxy/proxy.js +3 -0
  2. package/package.json +1 -1
  3. package/util/proxy-factory.js +33 -29
package/middleware/proxy/proxy.js CHANGED
@@ -244,7 +244,10 @@ exports = module.exports = function()
244
244
  });
245
245
  }
246
246
 
247
+ var t1 = new Date().getTime();
247
248
  proxyFactory.acquireProxyHandler(proxyTarget, null, function(err, proxyHandler) {
249
+ var t2 = new Date().getTime();
250
+ console.log("t21: " + (t2-t1));
248
251
  if (err) {
249
252
  return next(err);
250
253
  }
package/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  },
7
7
  "name": "cloudcms-server",
8
8
  "description": "Cloud CMS Application Server Module",
9
- "version": "3.2.294",
9
+ "version": "3.2.295",
10
10
  "repository": {
11
11
  "type": "git",
12
12
  "url": "git://github.com/gitana/cloudcms-server.git"
package/util/proxy-factory.js CHANGED
@@ -34,35 +34,40 @@ var acquireProxyHandler = exports.acquireProxyHandler = function(proxyTarget, pa
34
34
  return callback(null, _cachedHandler);
35
35
  }
36
36
 
37
- // take out a thread lock
38
- _LOCK(["acquireProxyHandler", name], function(err, releaseLockFn) {
39
-
40
- if (err)
41
- {
42
- console.log("Failed to acquire proxy handler: " + name + ", err: ", err);
43
-
44
- // failed to acquire lock
45
- return callback(err);
46
- }
47
-
48
- // second check to make sure another thread didn't create the handler in the meantime
49
- _cachedHandler = NAMED_PROXY_HANDLERS_CACHE[name];
50
- if (_cachedHandler)
51
- {
52
- releaseLockFn();
53
- return callback(null, _cachedHandler);
54
- }
55
-
56
- // create the proxy handler and cache it into LRU cache
57
- //console.log("Acquiring proxy handler: " + name + ", for target: " + proxyTarget + " and prefix: " + pathPrefix);
58
- _cachedHandler = createProxyHandler(proxyTarget, pathPrefix);
37
+ // // take out a thread lock
38
+ // _LOCK(["acquireProxyHandler", name], function(err, releaseLockFn) {
39
+ //
40
+ // if (err)
41
+ // {
42
+ // console.log("Failed to acquire proxy handler: " + name + ", err: ", err);
43
+ //
44
+ // // failed to acquire lock
45
+ // return callback(err);
46
+ // }
47
+ //
48
+ // // second check to make sure another thread didn't create the handler in the meantime
49
+ // _cachedHandler = NAMED_PROXY_HANDLERS_CACHE[name];
50
+ // if (_cachedHandler)
51
+ // {
52
+ // releaseLockFn();
53
+ // return callback(null, _cachedHandler);
54
+ // }
55
+ //
56
+ // // create the proxy handler and cache it into LRU cache
57
+ // //console.log("Acquiring proxy handler: " + name + ", for target: " + proxyTarget + " and prefix: " + pathPrefix);
58
+ // _cachedHandler = createProxyHandler(proxyTarget, pathPrefix);
59
+ //
60
+ // // store back into LRU cache
61
+ // NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
62
+ //
63
+ // releaseLockFn();
64
+ // callback(null, _cachedHandler);
65
+ // });
59
66
 
60
- // store back into LRU cache
61
- NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
62
-
63
- releaseLockFn();
64
- callback(null, _cachedHandler);
65
- });
67
+ _cachedHandler = createProxyHandler(proxyTarget, pathPrefix);
68
+ NAMED_PROXY_HANDLERS_CACHE[name] = _cachedHandler;
69
+
70
+ callback(null, _cachedHandler);
66
71
  };
67
72
 
68
73
 
@@ -242,7 +247,6 @@ var createProxyHandler = function(proxyTarget, pathPrefix)
242
247
  //////////////////////////////////////////////////////////////////////////
243
248
 
244
249
  var proxyRequestHandler = function(req, res) {
245
-
246
250
  proxy(req, res, pathPrefix, proxyOptions);
247
251
  };
248
252