#7568 handle spark status toolbar on multiple notebooks

twosigma · Jun 26, 2018 · cf5ce4e · cf5ce4e
1 parent 7320c39
commit cf5ce4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/beakerx/beakerx/handlers.py b/beakerx/beakerx/handlers.py
@@ -29,12 +29,15 @@ def data_received(self, chunk):
 
     @web.authenticated
     @tornado.web.asynchronous
-    def get(self, id):
+    def get(self, params):
 
         def handle_response(response):
             self.finish(response.body)
 
-        url = "http://localhost:4040/api/v1/applications/" + id + "/allexecutors"
+        addr_port = params.split('/')[2]
+        app_id = params.split('/')[3]
+
+        url = "http://" + addr_port + "/api/v1/applications/" + app_id + "/allexecutors"
         req = tornado.httpclient.HTTPRequest(
             url=url,
             method=self.request.method,

diff --git a/js/notebook/src/SparkUI.ts b/js/notebook/src/SparkUI.ts
@@ -290,9 +290,9 @@ export class SparkUIView extends widgets.VBoxView {
   }
 
   private setApiCallInterval(api: BeakerXApi): void {
-    const sparkUrl = `${api.getApiUrl('sparkmetrics/executors')}/${this.sparkAppId}`;
     const getMetrict = async () => {
       try {
+        let sparkUrl = `${api.getApiUrl('sparkmetrics/executors')}/${this.sparkUiWebUrl}/${this.sparkAppId}`;
         const response = await fetch(sparkUrl, { method: 'GET', credentials: 'include' });
 
         if (!response.ok) {