fork/cellxgene-gateway
1
0
Fork 0
mirror of https://github.com/Novartis/cellxgene-gateway.git synced 2026-10-08 05:18:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix redirect in cache_entry

Browse Source
This commit is contained in:
Gregor Sturm
2021-01-18 22:08:25 +01:00
parent fbc18fb636
commit 9c17e2ff32
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cellxgene_gateway/cache_entry.py
+4 -2
View File
@@ -8,6 +8,8 @@
# the specific language governing permissions and limitations under the License. # the specific language governing permissions and limitations under the License.
import datetime import datetime
import logging import logging
from flask.helpers import url_for
from flask.wrappers import Response
import psutil import psutil
from enum import Enum from enum import Enum
@@ -120,7 +122,7 @@ class CacheEntry:
return gateway_content return gateway_content
def gateway_basepath(self): def gateway_basepath(self):
return f"{env.external_protocol}://{env.external_host}/view/{self.key.pathpart}/" return url_for("do_view", path=self.key.pathpart) + "/"
def cellxgene_basepath(self): def cellxgene_basepath(self):
return f"http://127.0.0.1:{self.port}" return f"http://127.0.0.1:{self.port}"
@@ -130,7 +132,7 @@ class CacheEntry:
subpath = path[len(self.key.pathpart) :] # noqa: E203 subpath = path[len(self.key.pathpart) :] # noqa: E203
if len(subpath) == 0: if len(subpath) == 0:
r = make_response(f"Redirect to {gateway_basepath}\n", 301) r = make_response(f"Redirect to {gateway_basepath}\n", 302)
r.headers["location"] = gateway_basepath + querystring() r.headers["location"] = gateway_basepath + querystring()
return r return r
elif self.status == CacheEntryStatus.loading: elif self.status == CacheEntryStatus.loading: