Skip to content
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

Fixes pipes working under a url path #1108

Merged
merged 2 commits into from
Mar 3, 2016
Merged

Fixes pipes working under a url path #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
186a45e
Fixes the pipe-alive check when running scope-ui under a path
foot Mar 3, 2016
28a9826
Stops path-proxy from crashing on error messages
foot Mar 3, 2016
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
2 changes: 1 addition & 1 deletion client/app/scripts/utils/web-api-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions client/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down