Merge pull request #14 from nikolenkoanton92/master

fixed httpServer dependency, update version
lsm · Jan 14, 2016 · 0d76a33 · 0d76a33
2 parents a6ded79 + 0d57d78
commit 0d76a33
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/lib/service/pipeline.js b/lib/service/pipeline.js
@@ -60,7 +60,7 @@ exports.initRemoteService = superpipe()
     ['injectAssetInfo', 'proxyAsset', 'attachRoutes', 'proxyWebsocket'])
 
   .pipe('makeProxyHandlers',
-    ['getProxyHandler', 'scheduler', 'webServer', 'upgradeUrl'],
+    ['getProxyHandler', 'scheduler', 'httpServer', 'upgradeUrl'],
     ['proxyHandler', 'wsProxyHandler'])
   .pipe('injectAssetInfo?', ['assetInfo'])
   .pipe('addProxyHandlerToRoutes?', ['routes', 'proxyHandler'])

diff --git a/lib/service/remote.js b/lib/service/remote.js
@@ -52,12 +52,12 @@ exports.prepareFrameworkForRemote = function(framework, setDep) {
   setDep(framework, ['injectAssetInfo', 'proxyAsset', 'attachRoutes', 'proxyWebsocket'])
 }
 
-exports.makeProxyHandlers = function(getProxyHandler, scheduler, webServer, upgradeUrl) {
+exports.makeProxyHandlers = function(getProxyHandler, scheduler, httpServer, upgradeUrl) {
   var proxyHandler = getProxyHandler(scheduler)
   var wsProxyHandler
 
   if (upgradeUrl) {
-    wsProxyHandler = getProxyHandler(scheduler, webServer, upgradeUrl)
+    wsProxyHandler = getProxyHandler(scheduler, httpServer, upgradeUrl)
   }
 
   return {

diff --git a/lib/web/router.js b/lib/web/router.js
@@ -231,9 +231,10 @@ exports.rebuildRemoteMiddlewares = function(middlewares, service) {
  *
  * @param  {String} baseUrl      The base url for the target endpoint of the service.
  * @param  {String} allowUpgrade The url for upgrade request (websockets).
+ * @param  {Object} httpServer
  * @return {Function}            The proxy handler function.
  */
-exports.getProxyHandler = function(scheduler, webServer, allowUpgrade) {
+exports.getProxyHandler = function(scheduler, httpServer, allowUpgrade) {
   var proxy = httpProxy.createProxyServer()
 
   proxy.on('error', function(err, req, res) {
@@ -247,7 +248,7 @@ exports.getProxyHandler = function(scheduler, webServer, allowUpgrade) {
   })
 
   if (allowUpgrade) {
-    webServer.on('upgrade', function(req, socket, head) {
+    httpServer.on('upgrade', function(req, socket, head) {
       var provider = scheduler.get()
       if (!provider) {
         exports.noProviderAvailable(req, socket)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "micromono",
-  "version": "0.1.101",
+  "version": "0.1.102",
   "description": "Monolithic micro-services framework",
   "main": "lib/index.js",
   "bin": {