github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1108 from weaveworks/1099-fix-pipes-prefix-check

Browse Source 
Fixes pipes working under a url path
This commit is contained in:
Simon
2016-03-03 16:21:32 +01:00
parent fa4ab4837a 28a9826689
commit ce90680e06
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/app/scripts/utils/web-api-utils.js
View File

@@ -214,7 +214,7 @@ export function deletePipe(pipeId) {
}
export function getPipeStatus(pipeId) {
const url = `/api/pipe/${encodeURIComponent(pipeId)}/check`;
const url = `api/pipe/${encodeURIComponent(pipeId)}/check`;
reqwest({
method: 'GET',
url: url,

1
client/server.js
View File

@@ -107,6 +107,7 @@ var proxyRules = new HttpProxyRules({
});
var pathProxy = httpProxy.createProxy({ws: true});
pathProxy.on('error', function(err) { console.error('path proxy error', err); });
var pathProxyPort = port + 1;
const proxyPathServer = http.createServer(function(req, res) {
var target = proxyRules.match(req);