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

Fixes pipes working under a url path
weaveworks · Mar 3, 2016 · ce90680 · ce90680
2 parents fa4ab48 + 28a9826
commit ce90680
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/app/scripts/utils/web-api-utils.js b/client/app/scripts/utils/web-api-utils.js
@@ -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,

diff --git a/client/server.js b/client/server.js
@@ -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);