You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2017/08/16 17:06:58 UTC
[06/50] [abbrv] hadoop git commit: YARN-6631. Refactor loader.js in
new Yarn UI. Contributed by Akhil P B.
YARN-6631. Refactor loader.js in new Yarn UI. Contributed by Akhil P B.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d953c23
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d953c23
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d953c23
Branch: refs/heads/YARN-1011
Commit: 8d953c2359c5b12cf5b1f3c14be3ff5bb74242d0
Parents: ac7d060
Author: Sunil G <su...@apache.org>
Authored: Thu Aug 10 11:53:26 2017 +0530
Committer: Sunil G <su...@apache.org>
Committed: Thu Aug 10 11:53:26 2017 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/initializers/loader.js | 42 +++++++++-----------
1 file changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d953c23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
index aa8fb07..55f6e1b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -20,25 +20,27 @@
import Ember from 'ember';
-function getTimeLineURL() {
- return '/conf?name=yarn.timeline-service.webapp.address';
+function getTimeLineURL(rmhost) {
+ var url = window.location.protocol + '//' +
+ (ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + rmhost;
+
+ url += '/conf?name=yarn.timeline-service.webapp.address';
+ Ember.Logger.log("Get Timeline Address URL: " + url);
+ return url;
}
function updateConfigs(application) {
var hostname = window.location.hostname;
- var rmhost = hostname +
- (window.location.port ? ':' + window.location.port: '');
-
- Ember.Logger.log("RM Address:" + rmhost);
+ var rmhost = hostname + (window.location.port ? ':' + window.location.port: '');
if(!ENV.hosts.rmWebAddress) {
- ENV = {
- hosts: {
- rmWebAddress: rmhost,
- },
- };
+ ENV.hosts.rmWebAddress = rmhost;
+ } else {
+ rmhost = ENV.hosts.rmWebAddress;
}
+ Ember.Logger.log("RM Address: " + rmhost);
+
if(!ENV.hosts.timelineWebAddress) {
var timelinehost = "";
$.ajax({
@@ -46,7 +48,7 @@ function updateConfigs(application) {
dataType: 'json',
async: true,
context: this,
- url: getTimeLineURL(),
+ url: getTimeLineURL(rmhost),
success: function(data) {
timelinehost = data.property.value;
ENV.hosts.timelineWebAddress = timelinehost;
@@ -54,24 +56,18 @@ function updateConfigs(application) {
var address = timelinehost.split(":")[0];
var port = timelinehost.split(":")[1];
- Ember.Logger.log("Timeline Address from RM:" + address + ":" + port);
+ Ember.Logger.log("Timeline Address from RM: " + timelinehost);
if(address === "0.0.0.0" || address === "localhost") {
var updatedAddress = hostname + ":" + port;
-
- /* Timeline v2 is not supporting CORS, so make as default*/
- ENV = {
- hosts: {
- rmWebAddress: rmhost,
- timelineWebAddress: updatedAddress,
- },
- };
- Ember.Logger.log("Timeline Updated Address:" + updatedAddress);
+ ENV.hosts.timelineWebAddress = updatedAddress;
+ Ember.Logger.log("Timeline Updated Address: " + updatedAddress);
}
application.advanceReadiness();
- },
+ }
});
} else {
+ Ember.Logger.log("Timeline Address: " + ENV.hosts.timelineWebAddress);
application.advanceReadiness();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org