flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject [3/3] flink git commit: [FLINK-5382][web-frontend] Fix problems with downloading TM logs on Yarn
Date Wed, 04 Jan 2017 19:36:14 GMT
[FLINK-5382][web-frontend] Fix problems with downloading TM logs on Yarn


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a6a59999
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a6a59999
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a6a59999

Branch: refs/heads/release-1.2
Commit: a6a59999b21ef8c7fdd7d073296208f47d47ca6a
Parents: 7d1b9f0
Author: Sachin <sachingoel0101@gmail.com>
Authored: Tue Jan 3 19:28:11 2017 +0900
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Wed Jan 4 20:35:59 2017 +0100

----------------------------------------------------------------------
 .../app/partials/taskmanager/taskmanager.log.jade     |  2 +-
 .../app/partials/taskmanager/taskmanager.stdout.jade  |  2 +-
 .../modules/taskmanager/taskmanager.ctrl.coffee       |  8 ++------
 flink-runtime-web/web-dashboard/web/js/index.js       | 14 +++++---------
 .../web/partials/taskmanager/taskmanager.log.html     |  2 +-
 .../web/partials/taskmanager/taskmanager.stdout.html  |  2 +-
 6 files changed, 11 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/a6a59999/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.log.jade
----------------------------------------------------------------------
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
index 7a253a4..50e331e 100644
--- 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

http://git-wip-us.apache.org/repos/asf/flink/blob/a6a59999/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.stdout.jade
----------------------------------------------------------------------
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
index 438a2e8..8e1f12f 100644
--- 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

http://git-wip-us.apache.org/repos/asf/flink/blob/a6a59999/flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.ctrl.coffee
----------------------------------------------------------------------
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
index a83a444..2ba62e8 100644
--- 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,6 +45,7 @@ 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
 
@@ -52,17 +53,12 @@ angular.module('flinkApp')
     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"


Mime
View raw message