瀏覽代碼

AMBARI-4494. Need to provide info on where to look for command logs. (jaimin)

Jaimin Jetly 11 年之前
父節點
當前提交
61ad24e7b6

+ 3 - 1
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',

+ 2 - 2
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: &nbsp; <span class="muted">{{view.openedTask.errorLog}} </span></h5>
           <pre class="stderr">{{view.openedTask.stderr}}</pre>
-          <h5>stdout:</h5>
+          <h5>stdout: &nbsp; <span class="muted"> {{view.openedTask.outputLog}} </span> </h5>
           <pre class="stdout">{{view.openedTask.stdout}}</pre>
         </div>
       </div>

+ 2 - 2
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: &nbsp; <span class="muted">{{view.openedTask.errorLog}} </span></h5>
         <pre class="stderr">{{view.openedTask.stderr}}</pre>
-        <h5>stdout:</h5>
+        <h5>stdout: &nbsp; <span class="muted"> {{view.openedTask.outputLog}} </span> </h5>
         <pre class="stdout">{{view.openedTask.stdout}}</pre>
       </div>
     </div>

+ 3 - 1
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,

+ 3 - 0
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') {