diff --git a/core/src/main/resources/org/apache/spark/ui/static/utils.js b/core/src/main/resources/org/apache/spark/ui/static/utils.js index 1bec1c174df5a..43b9ef792d064 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/utils.js +++ b/core/src/main/resources/org/apache/spark/ui/static/utils.js @@ -96,20 +96,6 @@ function formatLogsCells(execLogs, type) { } function getStandAloneAppId(cb) { - var words = getBaseURI().split('/'); - var ind = words.indexOf("proxy"); - var appId; - if (ind > 0) { - appId = words[ind + 1]; - cb(appId); - return; - } - ind = words.indexOf("history"); - if (ind > 0) { - appId = words[ind + 1]; - cb(appId); - return; - } // Looks like Web UI is running in standalone mode // Let's get application-id using REST End Point $.getJSON(uiRoot + "/api/v1/applications", function(response, status, jqXHR) { @@ -117,6 +103,20 @@ function getStandAloneAppId(cb) { var appId = response[0].id; cb(appId); return; + } else { + var words = document.baseURI.split('/'); + var ind = words.indexOf("proxy"); + if (ind > 0) { + var appId = words[ind + 1]; + cb(appId); + return; + } + ind = words.indexOf("history"); + if (ind > 0) { + var appId = words[ind + 1]; + cb(appId) + return; + } } }); } @@ -231,4 +231,4 @@ function createRESTEndPointForMiscellaneousProcess(appId) { function getBaseURI() { return document.baseURI || document.URL; } -/* eslint-enable no-unused-vars */ \ No newline at end of file +/* eslint-enable no-unused-vars */