Repository: oozie Updated Branches: refs/heads/master 10549ef29 -> 9948829a1
OOZIE-2250 Show log for WAITING and TIMEDOUT coord actions (kailongs via rohini) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9948829a Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9948829a Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9948829a Branch: refs/heads/master Commit: 9948829a1b4897ddc5ce5e9409ccc91d080b03c1 Parents: 10549ef Author: Rohini Palaniswamy <[email protected]> Authored: Mon Jun 29 11:52:13 2015 -0700 Committer: Rohini Palaniswamy <[email protected]> Committed: Mon Jun 29 11:52:13 2015 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + webapp/src/main/webapp/oozie-console.js | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/9948829a/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index a53fcb6..4fb97f8 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2250 Show log for WAITING and TIMEDOUT coord actions (kailongs via rohini) OOZIE-2262 Fix log streaming from other server with start/end filter (kailongs via rohini) OOZIE-2159 'oozie validate' command should be moved server-side (seoeun25 via rkanter) OOZIE-2271 Upgrade Tomcat to 6.0.44 (rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/9948829a/webapp/src/main/webapp/oozie-console.js ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/oozie-console.js b/webapp/src/main/webapp/oozie-console.js index ab184e3..574832f 100644 --- a/webapp/src/main/webapp/oozie-console.js +++ b/webapp/src/main/webapp/oozie-console.js @@ -1037,6 +1037,7 @@ function coordJobDetailsPopup(response, request) { var actionsTextBox = new Ext.form.TextField({ fieldLabel: 'ActionsList', name: 'ActionsList', + id: 'actions_text_box', width: 150, value: '' }); @@ -1052,6 +1053,7 @@ function coordJobDetailsPopup(response, request) { var searchFilterBox = new Ext.form.TextField({ fieldLabel: 'searchFilterBox', name: 'searchFilterBox', + id: 'search_filter_box', width: 350, value: '' }); @@ -1278,7 +1280,15 @@ function coordJobDetailsPopup(response, request) { function showWorkflowPopup(thisGrid, rowIndex, cellIndex, e) { var actionStatus = thisGrid.store.data.items[rowIndex].data; var workflowId = actionStatus["externalId"]; - jobDetailsGridWindow(workflowId); + if(workflowId == null) { + jobDetailsTab.getComponent('coord_job_log').show(); + Ext.getCmp('actions_text_box').setValue(actionStatus["id"].split("@")[1]); + Ext.getCmp('search_filter_box').setValue('recent=5m'); + fetchLogs(coordJobId, actionsTextBox.getValue()); + } + else { + jobDetailsGridWindow(workflowId); + } } // alert("Coordinator PopUP 4 inside coordDetailsPopup "); function showCoordActionContextMenu(thisGrid, rowIndex, cellIndex, e) { @@ -1500,6 +1510,7 @@ function coordJobDetailsPopup(response, request) { },{ title: 'Coord Job Log', items: jobLogArea, + id: 'coord_job_log', tbar: [ actionsText,actionsTextBox, searchFilter, searchFilterBox, getLogButton, {xtype: 'tbfill'}, logStatus] },
