Browse Source

HUE-2176 [oozie] Changed refresh intervals

Removed log from returned workflow/coord/bundle JSON
Separate call to the new getLog
Enrico Berti 11 years ago
parent
commit
29c8186

+ 19 - 10
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundle.mako

@@ -151,12 +151,12 @@ ${ layout.menubar(section='bundles', dashboard=True) }
           </tbody>
           <tfoot>
             <tr data-bind="visible: isLoading()">
-              <td colspan="2" class="left">
+              <td colspan="3" class="left">
                 <img src="/static/art/spinner.gif" />
               </td>
             </tr>
             <tr data-bind="visible: actions().length == 0 && !isLoading()">
-              <td colspan="2">
+              <td colspan="3">
                 <div class="alert">
                   ${ _('There are no actions to be shown.') }
                 </div>
@@ -428,7 +428,23 @@ ${ layout.menubar(section='bundles', dashboard=True) }
 
     resizeLogs();
     refreshView();
+    refreshLogs();
+
     var logsAtEnd = true;
+    function refreshLogs() {
+      $.getJSON("${ url('oozie:get_oozie_job_log', job_id=oozie_bundle.id) }", function (data) {
+        var _logsEl = $("#log pre");
+        _logsEl.text(data.log);
+
+        if (logsAtEnd) {
+          _logsEl.scrollTop(_logsEl[0].scrollHeight - _logsEl.height());
+        }
+        if (data.status != "RUNNING" && data.status != "PREP"){
+          return;
+        }
+        window.setTimeout(refreshLogs, 20000);
+      });
+    }
 
     function refreshView() {
       $.getJSON("${ oozie_bundle.get_absolute_url(format='json') }", function (data) {
@@ -469,17 +485,10 @@ ${ layout.menubar(section='bundles', dashboard=True) }
 
         $("#progress .bar").text(data.progress + "%").css("width", data.progress + "%").attr("class", "bar " + getStatusClass(data.status, "bar-"));
 
-        var _logsEl = $("#log pre");
-        _logsEl.text(data.log);
-
-        if (logsAtEnd) {
-          _logsEl.scrollTop(_logsEl[0].scrollHeight - _logsEl.height());
-        }
-
         if (data.status != "RUNNING" && data.status != "PREP"){
           return;
         }
-        window.setTimeout(refreshView, 20000);
+        window.setTimeout(refreshView, 5000);
       });
     }
 

+ 17 - 7
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -548,7 +548,23 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
 
     resizeLogs();
     refreshView();
+    refreshLogs();
+
     var logsAtEnd = true;
+    function refreshLogs() {
+      $.getJSON("${ url('oozie:get_oozie_job_log', job_id=oozie_coordinator.id) }", function (data) {
+        var _logsEl = $("#log pre");
+        _logsEl.text(data.log);
+
+        if (logsAtEnd) {
+          _logsEl.scrollTop(_logsEl[0].scrollHeight - _logsEl.height());
+        }
+        if (data.status != "RUNNING" && data.status != "PREP"){
+          return;
+        }
+        window.setTimeout(refreshLogs, 20000);
+      });
+    }
 
     function refreshView() {
       $.getJSON("${ oozie_coordinator.get_absolute_url(oozie_bundle=oozie_bundle, format='json') }" + "${ "&show_all_actions=true" if show_all_actions else '' | n,unicode }", function (data) {
@@ -584,16 +600,10 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
 
         $("#progress .bar").text(data.progress + "%").css("width", data.progress + "%").attr("class", "bar " + getStatusClass(data.status, "bar-"));
 
-        var _logsEl = $("#log pre");
-        _logsEl.text(data.log);
-
-        if (logsAtEnd) {
-          _logsEl.scrollTop(_logsEl[0].scrollHeight - _logsEl.height());
-        }
         if (data.status != "RUNNING" && data.status != "PREP"){
           return;
         }
-        window.setTimeout(refreshView, 20000);
+        window.setTimeout(refreshView, 5000);
       });
     }
 

+ 17 - 7
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -582,7 +582,24 @@ ${ layout.menubar(section='workflows', dashboard=True) }
 
     resizeLogs();
     refreshView();
+    refreshLogs();
+
     var logsAtEnd = true;
+    function refreshLogs() {
+      $.getJSON("${ url('oozie:get_oozie_job_log', job_id=oozie_workflow.id) }", function (data) {
+        var _logsEl = $("#log pre");
+        _logsEl.text(data.log);
+
+        if (logsAtEnd) {
+          _logsEl.scrollTop(_logsEl[0].scrollHeight - _logsEl.height());
+        }
+        if (data.status != "RUNNING" && data.status != "PREP"){
+          return;
+        }
+        window.setTimeout(refreshLogs, 3000);
+      });
+    }
+
 
     function refreshView() {
       $.getJSON("${ oozie_workflow.get_absolute_url(format='json') }", function (data) {
@@ -619,13 +636,6 @@ ${ layout.menubar(section='workflows', dashboard=True) }
 
         $("#graph").html(data.graph);
 
-        var _logsEl = $("#log pre");
-
-        _logsEl.text(data.log);
-
-        if (logsAtEnd) {
-          _logsEl.scrollTop(_logsEl[0].scrollHeight - _logsEl.height());
-        }
         if (data.status != "RUNNING" && data.status != "PREP"){
           return;
         }

+ 0 - 3
apps/oozie/src/oozie/views/dashboard.py

@@ -206,7 +206,6 @@ def list_oozie_workflow(request, job_id):
       'status':  oozie_workflow.status,
       'progress': oozie_workflow.get_progress(full_node_list),
       'graph': workflow_graph,
-      'log': oozie_workflow.log,
       'actions': massaged_workflow_actions_for_json(oozie_workflow.get_working_actions(), oozie_coordinator, oozie_bundle)
     }
     return HttpResponse(encode_json_for_js(return_obj), mimetype="application/json")
@@ -262,7 +261,6 @@ def list_oozie_coordinator(request, job_id):
       'progress': oozie_coordinator.get_progress(),
       'nextTime': format_time(oozie_coordinator.nextMaterializedTime),
       'endTime': format_time(oozie_coordinator.endTime),
-      'log': oozie_coordinator.log,
       'actions': actions,
       'show_all_actions': show_all_actions
     }
@@ -308,7 +306,6 @@ def list_oozie_bundle(request, job_id):
       'status':  oozie_bundle.status,
       'progress': oozie_bundle.get_progress(),
       'endTime': format_time(oozie_bundle.endTime),
-      'log': oozie_bundle.log,
       'actions': massaged_bundle_actions_for_json(oozie_bundle)
     }
     return HttpResponse(json.dumps(return_obj).replace('\\\\', '\\'), mimetype="application/json")