[FLINK-5382][web-frontend] Fix problems with downloading TM logs on Yarn

tchanghunua · Jan 4, 2017 · 29eec70 · 29eec70
1 parent 1358753
commit 29eec70
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 19 deletions.
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.log.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.log.jade
@@ -26,7 +26,7 @@ table.table.table-properties
  a(ng-click="reloadData()" class="show-pointer")
  i.fa.fa-refresh
  .col-xs-1.text-left
- a(ng-click="downloadData()" class="show-pointer")
+ a(href="taskmanagers/{{taskmanagerid}}/log")
  i.fa.fa-download
 
  tbody

diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.stdout.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.stdout.jade
@@ -26,7 +26,7 @@ table.table.table-properties
  a(ng-click="reloadData()" class="show-pointer")
  i.fa.fa-refresh
  .col-xs-1.text-left
- a(ng-click="downloadData()" class="show-pointer")
+ a(href="taskmanagers/{{taskmanagerid}}/stdout")
  i.fa.fa-download
 
  tbody

diff --git a/flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.ctrl.coffee b/flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.ctrl.coffee
@@ -45,24 +45,20 @@ angular.module('flinkApp')
 
 .controller 'SingleTaskManagerLogsController', ($scope, $stateParams, SingleTaskManagerService, $interval, flinkConfig) ->
  $scope.log = {}
+ $scope.taskmanagerid = $stateParams.taskmanagerid
  SingleTaskManagerService.loadLogs($stateParams.taskmanagerid).then (data) ->
  $scope.log = data
 
  $scope.reloadData = () ->
  SingleTaskManagerService.loadLogs($stateParams.taskmanagerid).then (data) ->
  $scope.log = data
 
- $scope.downloadData = () ->
- window.location.href = "/taskmanagers/" + ($stateParams.taskmanagerid) + "/log"
-
 .controller 'SingleTaskManagerStdoutController', ($scope, $stateParams, SingleTaskManagerService, $interval, flinkConfig) ->
  $scope.stdout = {}
+ $scope.taskmanagerid = $stateParams.taskmanagerid
  SingleTaskManagerService.loadStdout($stateParams.taskmanagerid).then (data) ->
  $scope.stdout = data
 
  $scope.reloadData = () ->
  SingleTaskManagerService.loadStdout($stateParams.taskmanagerid).then (data) ->
  $scope.stdout = data
-
- $scope.downloadData = () ->
- window.location.href = "/taskmanagers/" + ($stateParams.taskmanagerid) + "/stdout"
diff --git a/flink-runtime-web/web-dashboard/web/js/index.js b/flink-runtime-web/web-dashboard/web/js/index.js
diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.log.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.log.html
@@ -24,7 +24,7 @@
  <div class="row">
  <div class="col-xs-10">Task Manager Logs</div>
  <div class="col-xs-1 text-right"><a ng-click="reloadData()" class="show-pointer"><i class="fa fa-refresh"></i></a></div>
- <div class="col-xs-1 text-left"><a ng-click="downloadData()" class="show-pointer"><i class="fa fa-download"></i></a></div>
+ <div class="col-xs-1 text-left"><a href="taskmanagers/{{taskmanagerid}}/log"><i class="fa fa-download"></i></a></div>
  </div>
  </th>
  </tr>

diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.stdout.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.stdout.html
@@ -24,7 +24,7 @@
  <div class="row">
  <div class="col-xs-10">Task Manager Output</div>
  <div class="col-xs-1 text-right"><a ng-click="reloadData()" class="show-pointer"><i class="fa fa-refresh"></i></a></div>
- <div class="col-xs-1 text-left"><a ng-click="downloadData()" class="show-pointer"><i class="fa fa-download"></i></a></div>
+ <div class="col-xs-1 text-left"><a href="taskmanagers/{{taskmanagerid}}/stdout"><i class="fa fa-download"></i></a></div>
  </div>
  </th>
  </tr>