diff --git a/lib/galaxy/web/proxy/js/lib/proxy.js b/lib/galaxy/web/proxy/js/lib/proxy.js index ad4276d90e3..72eacccc4ee 100644 --- a/lib/galaxy/web/proxy/js/lib/proxy.js +++ b/lib/galaxy/web/proxy/js/lib/proxy.js @@ -10,9 +10,9 @@ var bound = function (that, method) { }; var DynamicProxy = function(options) { - var dynamicProxy = this; - this.sessionCookie = options.sessionCookie; - this.sessionMap = options.sessionMap; + var dynamicProxy = this; + this.sessionCookie = options.sessionCookie; + this.sessionMap = options.sessionMap; this.debug = options.verbose; var log_errors = function(handler) { @@ -30,9 +30,9 @@ var DynamicProxy = function(options) { }); this.proxy_server = http.createServer( - log_errors(dynamicProxy.handleProxyRequest) + log_errors(dynamicProxy.handleProxyRequest) ); - this.proxy_server.on('upgrade', bound(this, this.handleWs)); + this.proxy_server.on('upgrade', bound(this, this.handleWs)); }; DynamicProxy.prototype.rewriteRequest = function(request) { @@ -59,7 +59,7 @@ DynamicProxy.prototype.targetForRequest = function(request) { // return proxy target for a given url var session = this.findSession(request); for (var mappedSession in this.sessionMap) { - if(session == mappedSession) { + if(session == mappedSession) { return this.sessionMap[session].target; } } @@ -75,11 +75,11 @@ DynamicProxy.prototype.findSession = function(request) { } var cookies = rc.split(';'); for(var cookieIndex in cookies) { - var cookie = cookies[cookieIndex]; + var cookie = cookies[cookieIndex]; var parts = cookie.split('='); - var partName = parts.shift().trim(); + var partName = parts.shift().trim(); if(partName == sessionCookie) { - return unescape(parts.join('=')) + return unescape(parts.join('=')) } } @@ -89,7 +89,7 @@ DynamicProxy.prototype.findSession = function(request) { DynamicProxy.prototype.handleProxyRequest = function(req, res) { var target = this.targetForRequest(req); if(this.debug) { - console.log("PROXY " + req.method + " " + req.url + " to " + target); + console.log("PROXY " + req.method + " " + req.url + " to " + target.host + ':' + target.port); } var origin = req.headers.origin; this.rewriteRequest(req); @@ -113,7 +113,7 @@ DynamicProxy.prototype.handleWs = function(req, res, head) { // no local route found, time to proxy var target = this.targetForRequest(req); if(this.debug) { - console.log("PROXY WS " + req.url + " to " + req.url); + console.log("PROXY WS " + req.url + " to " + target.host + ':' + target.port); } var origin = req.headers.origin; this.rewriteRequest(req);