Skip to content

fix: Nginx url had double leading slash #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 27, 2022
Merged

fix: Nginx url had double leading slash #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compose/dev/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ server {
proxy_pass http://api:4000;
}
location /runtime {
rewrite ^/runtime(.*)$ /$1 break;
rewrite ^/runtime(.*)$ $1 break;
proxy_pass http://proxy:4010;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
Expand All @@ -28,7 +28,7 @@ server {

# This is not working
location /prisma {
rewrite ^/prisma(.*)$ /$1 break;
rewrite ^/prisma(.*)$ $1 break;
proxy_pass http://prisma:5555;
}
}
Expand Down
12 changes: 1 addition & 11 deletions proxy/src/node-proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,17 +307,7 @@ function startProxyServer() {
return;
}
console.log("proxy ws req", req.url);
if (req.url.startsWith("//")) {
// FIXME why there're two leading slashes? "//user_xxx_repo_xxx"
// UPDATE: for docker runtime, there's double slashes
// console.log("active docker connection", req.url.substring(1));
activeTable[req.url.substring(1)] = new Date();
} else {
// For k8s runtime, there's only one slash
// console.log("active k8s connection", req.url);
activeTable[req.url] = new Date();
}
activeTable[req.url.substring(1)] = new Date();
activeTable[req.url] = new Date();
let match = await getRouteTarget(req);
if (!match) {
return;
Expand Down