From 186a45e05284ea114dc5c02db92dac056c271634 Mon Sep 17 00:00:00 2001
From: Simon Howe <footless@gmail.com>
Date: Thu, 3 Mar 2016 14:13:40 +0100
Subject: [PATCH 1/2] Fixes the pipe-alive check when running scope-ui under a
 path

---
 client/app/scripts/utils/web-api-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/scripts/utils/web-api-utils.js b/client/app/scripts/utils/web-api-utils.js
index 3fd3a979d1..fe48b0faca 100644
--- 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,

From 28a98266899b05d1fc492a5d740e1de4cf6a00c0 Mon Sep 17 00:00:00 2001
From: Simon Howe <footless@gmail.com>
Date: Thu, 3 Mar 2016 14:14:20 +0100
Subject: [PATCH 2/2] Stops path-proxy from crashing on error messages

---
 client/server.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/server.js b/client/server.js
index 62fb9d7c8b..009b4d5447 100644
--- 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);