opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #355 from bgruening/js_debug

Browse Source 
Make debugging output nicer for IE's
This commit is contained in:
John Chilton
2015-06-16 10:58:20 -04:00
parent 0ba756e0f2 8f6a3f5d49
commit 1113eba71a
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/proxy/js/lib/proxy.js
+11 -11
View File
@@ -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);