mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Updated PR based on comments
Removed log statements from proxy.js Added space back to validation_hdf5.xml Changed Mcool class to inherit from Cool in binary.py
This commit is contained in:
@@ -1107,7 +1107,7 @@ class Cool(H5):
|
||||
return "Cool (HDF5) file (%s)." % (nice_size(dataset.get_size()))
|
||||
|
||||
|
||||
class MCool(H5):
|
||||
class MCool(Cool):
|
||||
"""
|
||||
Class describing the multi-resolution cool format (https://github.com/mirnylab/cooler)
|
||||
"""
|
||||
|
||||
@@ -60,7 +60,6 @@ DynamicProxy.prototype.rewriteRequest = function(request) {
|
||||
DynamicProxy.prototype.targetForRequest = function(request) {
|
||||
// return proxy target for a given url
|
||||
var session = this.findSession(request);
|
||||
console.log('Session: ', session);
|
||||
for (var mappedSession in this.sessionMap) {
|
||||
if(session == mappedSession) {
|
||||
return this.sessionMap[session].target;
|
||||
@@ -71,10 +70,8 @@ DynamicProxy.prototype.targetForRequest = function(request) {
|
||||
};
|
||||
|
||||
DynamicProxy.prototype.findSession = function(request) {
|
||||
console.log("SessionCookie: ", this.sessionCookie);
|
||||
var sessionCookie = this.sessionCookie,
|
||||
rc = request.headers.cookie;
|
||||
console.log('RequestCookie: ', rc);
|
||||
if(!rc) {
|
||||
return null;
|
||||
}
|
||||
@@ -94,10 +91,6 @@ DynamicProxy.prototype.findSession = function(request) {
|
||||
DynamicProxy.prototype.handleProxyRequest = function(req, res) {
|
||||
var othis = this;
|
||||
var target = this.targetForRequest(req);
|
||||
console.log(req.method);
|
||||
console.log(req.url);
|
||||
console.log(target.host);
|
||||
console.log(target.port);
|
||||
if(this.debug) {
|
||||
console.log("PROXY " + req.method + " " + req.url + " to " + target.host + ':' + target.port);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<param name="input" value="matrix.cool" />
|
||||
<output name="output">
|
||||
<assert_contents>
|
||||
<has_h5_keys keys="bins,chroms,indexes,pixels" />
|
||||
<has_h5_keys keys="bins, chroms,indexes,pixels" />
|
||||
<contains_h5_keys keys="bins,chroms/length,chroms,name" />
|
||||
<has_h5_attribute key="nbins" value="33754" />
|
||||
<has_h5_attribute key="nchroms" value="15" />
|
||||
|
||||
Reference in New Issue
Block a user