You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/02/01 00:45:10 UTC
git commit: AMBARI-4494. Need to provide info on where to look for
command logs. (jaimin)
Updated Branches:
refs/heads/trunk d15577d0c -> 61ad24e7b
AMBARI-4494. Need to provide info on where to look for command logs. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61ad24e7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61ad24e7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61ad24e7
Branch: refs/heads/trunk
Commit: 61ad24e7b6e521f52e9aae150da45bf9659d381b
Parents: d15577d
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Jan 31 15:44:47 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Jan 31 15:44:47 2014 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 4 +++-
ambari-web/app/templates/common/host_progress_popup.hbs | 4 ++--
ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs | 4 ++--
ambari-web/app/utils/host_progress_popup.js | 4 +++-
ambari-web/app/views/wizard/step9_view.js | 3 +++
5 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/61ad24e7/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 605c3da..9f277aa 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -181,7 +181,9 @@ Em.I18n.translations = {
'common.url': 'URL',
'common.advanced': 'Advanced',
'common.download': 'Download',
-
+ 'common.hostLog.popup.logDir.path':'/var/lib/ambari-agent/data/',
+ 'common.hostLog.popup.outputLog.value': 'output-{0}.txt',
+ 'common.hostLog.popup.errorLog.value': 'errors-{0}.txt',
'passiveState.turnOn':'Turn On Passive Mode',
'passiveState.turnOff':'Turn Off Passive Mode',
'passiveState.turnOnFor':'Turn On Passive Mode for',
http://git-wip-us.apache.org/repos/asf/ambari/blob/61ad24e7/ambari-web/app/templates/common/host_progress_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs
index 083fb5e..1fcde93 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -190,9 +190,9 @@
<div class="content-area" >
<div class="task-detail-log-clipboard-wrap" ></div>
<div class="task-detail-log-maintext">
- <h5>stderr:</h5>
+ <h5>stderr: <span class="muted">{{view.openedTask.errorLog}} </span></h5>
<pre class="stderr">{{view.openedTask.stderr}}</pre>
- <h5>stdout:</h5>
+ <h5>stdout: <span class="muted"> {{view.openedTask.outputLog}} </span> </h5>
<pre class="stdout">{{view.openedTask.stdout}}</pre>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/61ad24e7/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs b/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
index 08c1df4..6a89a81 100644
--- a/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
+++ b/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
@@ -62,9 +62,9 @@
<div class="content-area" >
<div class="task-detail-log-clipboard-wrap" ></div>
<div class="task-detail-log-maintext">
- <h5>stderr:</h5>
+ <h5>stderr: <span class="muted">{{view.openedTask.errorLog}} </span></h5>
<pre class="stderr">{{view.openedTask.stderr}}</pre>
- <h5>stdout:</h5>
+ <h5>stdout: <span class="muted"> {{view.openedTask.outputLog}} </span> </h5>
<pre class="stdout">{{view.openedTask.stdout}}</pre>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/61ad24e7/ambari-web/app/utils/host_progress_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js
index 7e0e6aa..d91e402 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -267,10 +267,12 @@ App.HostPopup = Em.Object.create({
createTask: function (_task) {
return Ember.Object.create({
id: _task.Tasks.id,
- hostName: _task.Tasks.hostName,
+ hostName: _task.Tasks.host_name,
command: ( _task.Tasks.command.toLowerCase() != 'service_check') ? _task.Tasks.command.toLowerCase() : '',
status: App.format.taskStatus(_task.Tasks.status),
role: App.format.role(_task.Tasks.role),
+ outputLog: Em.I18n.t('common.hostLog.popup.logDir.path') + Em.I18n.t('common.hostLog.popup.outputLog.value').format(_task.Tasks.id),
+ errorLog: Em.I18n.t('common.hostLog.popup.logDir.path') + Em.I18n.t('common.hostLog.popup.errorLog.value').format(_task.Tasks.id),
stderr: _task.Tasks.stderr,
stdout: _task.Tasks.stdout,
isVisible: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/61ad24e7/ambari-web/app/views/wizard/step9_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step9_view.js b/ambari-web/app/views/wizard/step9_view.js
index 4593622..5203070 100644
--- a/ambari-web/app/views/wizard/step9_view.js
+++ b/ambari-web/app/views/wizard/step9_view.js
@@ -219,6 +219,9 @@ App.HostStatusView = Em.View.extend({
taskInfo.set('stdout', _task.Tasks.stdout);
taskInfo.set('isVisible', true);
taskInfo.set('icon', '');
+ taskInfo.set('hostName', _task.Tasks.host_name);
+ taskInfo.set('outputLog', Em.I18n.t('common.hostLog.popup.logDir.path') + Em.I18n.t('common.hostLog.popup.outputLog.value').format(_task.Tasks.id));
+ taskInfo.set('errorLog', Em.I18n.t('common.hostLog.popup.logDir.path') + Em.I18n.t('common.hostLog.popup.errorLog.value').format(_task.Tasks.id));
if (taskInfo.get('status') == 'pending' || taskInfo.get('status') == 'queued') {
taskInfo.set('icon', 'icon-cog');
} else if (taskInfo.get('status') == 'in_progress') {