提交 3b8b4f0f 编写于 作者: U Ufuk Celebi 提交者: Stephan Ewen

[FLINK-2769] [dashboard] Remove hard coded job server URL

This closes #1185
上级 8d2289ea
...@@ -22,7 +22,7 @@ angular.module('flinkApp') ...@@ -22,7 +22,7 @@ angular.module('flinkApp')
@loadConfig = -> @loadConfig = ->
deferred = $q.defer() deferred = $q.defer()
$http.get flinkConfig.jobServer + "/config" $http.get "/config"
.success (data, status, headers, config) -> .success (data, status, headers, config) ->
deferred.resolve(data) deferred.resolve(data)
......
...@@ -29,8 +29,6 @@ angular.module('flinkApp', ['ui.router', 'angularMoment']) ...@@ -29,8 +29,6 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
# -------------------------------------- # --------------------------------------
.value 'flinkConfig', { .value 'flinkConfig', {
jobServer: 'http://localhost:8081'
# jobServer: 'http://localhost:3000/new-server'
"refresh-interval": 10000 "refresh-interval": 10000
} }
......
...@@ -86,7 +86,7 @@ angular.module('flinkApp') ...@@ -86,7 +86,7 @@ angular.module('flinkApp')
@listJobs = -> @listJobs = ->
deferred = $q.defer() deferred = $q.defer()
$http.get flinkConfig.jobServer + "/joboverview" $http.get "/joboverview"
.success (data, status, headers, config) => .success (data, status, headers, config) =>
angular.forEach data, (list, listKey) => angular.forEach data, (list, listKey) =>
switch listKey switch listKey
...@@ -110,12 +110,12 @@ angular.module('flinkApp') ...@@ -110,12 +110,12 @@ angular.module('flinkApp')
currentJob = null currentJob = null
deferreds.job = $q.defer() deferreds.job = $q.defer()
$http.get flinkConfig.jobServer + "/jobs/" + jobid $http.get "/jobs/" + jobid
.success (data, status, headers, config) => .success (data, status, headers, config) =>
@setEndTimes(data.vertices) @setEndTimes(data.vertices)
@processVertices(data) @processVertices(data)
$http.get flinkConfig.jobServer + "/jobs/" + jobid + "/config" $http.get "/jobs/" + jobid + "/config"
.success (jobConfig) -> .success (jobConfig) ->
data = angular.extend(data, jobConfig) data = angular.extend(data, jobConfig)
...@@ -157,7 +157,7 @@ angular.module('flinkApp') ...@@ -157,7 +157,7 @@ angular.module('flinkApp')
deferreds.job.promise.then (data) => deferreds.job.promise.then (data) =>
vertex = @seekVertex(vertexid) vertex = @seekVertex(vertexid)
$http.get flinkConfig.jobServer + "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasktimes" $http.get "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasktimes"
.success (data) => .success (data) =>
# TODO: change to subtasktimes # TODO: change to subtasktimes
vertex.subtasks = data.subtasks vertex.subtasks = data.subtasks
...@@ -172,7 +172,7 @@ angular.module('flinkApp') ...@@ -172,7 +172,7 @@ angular.module('flinkApp')
deferreds.job.promise.then (data) => deferreds.job.promise.then (data) =>
# vertex = @seekVertex(vertexid) # vertex = @seekVertex(vertexid)
$http.get flinkConfig.jobServer + "/jobs/" + currentJob.jid + "/vertices/" + vertexid $http.get "/jobs/" + currentJob.jid + "/vertices/" + vertexid
.success (data) -> .success (data) ->
subtasks = data.subtasks subtasks = data.subtasks
...@@ -186,11 +186,11 @@ angular.module('flinkApp') ...@@ -186,11 +186,11 @@ angular.module('flinkApp')
deferreds.job.promise.then (data) => deferreds.job.promise.then (data) =>
# vertex = @seekVertex(vertexid) # vertex = @seekVertex(vertexid)
$http.get flinkConfig.jobServer + "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/accumulators" $http.get "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/accumulators"
.success (data) -> .success (data) ->
accumulators = data['user-accumulators'] accumulators = data['user-accumulators']
$http.get flinkConfig.jobServer + "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasks/accumulators" $http.get "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasks/accumulators"
.success (data) -> .success (data) ->
subtaskAccumulators = data.subtasks subtaskAccumulators = data.subtasks
...@@ -203,7 +203,7 @@ angular.module('flinkApp') ...@@ -203,7 +203,7 @@ angular.module('flinkApp')
deferreds.job.promise.then (data) => deferreds.job.promise.then (data) =>
$http.get flinkConfig.jobServer + "/jobs/" + currentJob.jid + "/exceptions" $http.get "/jobs/" + currentJob.jid + "/exceptions"
.success (exceptions) -> .success (exceptions) ->
currentJob.exceptions = exceptions currentJob.exceptions = exceptions
......
...@@ -24,7 +24,7 @@ angular.module('flinkApp') ...@@ -24,7 +24,7 @@ angular.module('flinkApp')
@loadOverview = -> @loadOverview = ->
deferred = $q.defer() deferred = $q.defer()
$http.get(flinkConfig.jobServer + "/overview") $http.get("/overview")
.success (data, status, headers, config) -> .success (data, status, headers, config) ->
overview = data overview = data
deferred.resolve(data) deferred.resolve(data)
......
...@@ -22,7 +22,7 @@ angular.module('flinkApp') ...@@ -22,7 +22,7 @@ angular.module('flinkApp')
@loadManagers = -> @loadManagers = ->
deferred = $q.defer() deferred = $q.defer()
$http.get(flinkConfig.jobServer + "/taskmanagers") $http.get("/taskmanagers")
.success (data, status, headers, config) -> .success (data, status, headers, config) ->
deferred.resolve(data['taskmanagers']) deferred.resolve(data['taskmanagers'])
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册