X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e13874a4bb666423c5b2ddf1ebb517a10789f4c0..2b699dec710d1f0719ec0471bc711a467ac34a95:/apps/workbench/app/views/jobs/_show_log.html.erb
diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index b523af81ae..7d67b74210 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -1,11 +1,20 @@
<% if !@object.log %>
-<% log_history = stderr_log_history([@object.uuid]) %>
-
- <% log_history.each do |entry| %>
- <%=entry%>
- <% end %>
-
+
+
+
+
+<%# Applying a long throttle suppresses the auto-refresh of this
+ partial that would normally be triggered by arv-log-event. %>
+
+ >
<% else %>
@@ -50,20 +59,65 @@ var makeFilter = function() {
});
}
-<% if @object.log %>
+<% if @object.log and !@object.log.empty? %>
<% logcollection = Collection.find @object.log %>
<% if logcollection %>
- $.ajax('<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>').
- done(function(data, status, jqxhr) {
- logViewer.filter();
- addToLogViewer(logViewer, data.split("\n"), taskState);
- logViewer.filter(makeFilter());
- generateJobOverview("#log-viewer-overview", logViewer, taskState);
- $("#log-viewer .spinner").detach();
- }).
- fail(function(jqxhr, status, error) {
- $("#log-viewer .spinner").detach();
- });
+ var log_size = <%= logcollection.files[0][2] %>
+ var log_maxbytes = <%= Rails.configuration.log_viewer_max_bytes %>;
+ var logcollection_url = '<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>';
+ $("#log-viewer-download-url").attr('href', logcollection_url);
+ $("#log-viewer-download-pane").show();
+ var headers = {};
+ if (log_size > log_maxbytes) {
+ headers['Range'] = 'bytes=0-' + log_maxbytes;
+ }
+ var ajax_opts = { dataType: 'text', headers: headers };
+ load_log();
+
+ function load_log() {
+ $.ajax(logcollection_url, ajax_opts).done(done).fail(fail);
+ }
+ function done(data, status, jqxhr) {
+ if (jqxhr.getResponseHeader('Content-Type').indexOf('application/json') === 0) {
+ // The browser won't allow a redirect-with-cookie response
+ // because keep-web isn't same-origin with us. Instead, we
+ // assure keep-web it's OK to respond with the content
+ // immediately by setting the token in the request body
+ // instead and adding disposition=attachment.
+ logcollection_url = JSON.parse(data).href;
+ var queryAt = logcollection_url.indexOf('?api_token=');
+ if (queryAt >= 0) {
+ ajax_opts.method = 'POST';
+ ajax_opts.data = {
+ api_token: logcollection_url.slice(queryAt+11),
+ disposition: 'attachment',
+ };
+ logcollection_url = logcollection_url.slice(0, queryAt);
+ }
+ return load_log();
+ }
+ logViewer.filter();
+ addToLogViewer(logViewer, data.split("\n"), taskState);
+ logViewer.filter(makeFilter());
+ content_range_hdr = jqxhr.getResponseHeader('Content-Range');
+ var v = content_range_hdr && content_range_hdr.match(/bytes \d+-(\d+)\/(.+)/);
+ short_log = v && (v[2] == '*' || parseInt(v[1]) + 1 < v[2]);
+ if (jqxhr.status == 206 && short_log) {
+ $("#log-viewer-overview").html(
+ 'Showing only ' + data.length + ' bytes of this log.' +
+ ' Timing information is unavailable since' +
+ ' the full log was not retrieved.
'
+ );
+ } else {
+ generateJobOverview("#log-viewer-overview", logViewer, taskState);
+ }
+ $("#log-viewer .spinner").detach();
+ }
+ function fail(jqxhr, status, error) {
+ // TODO: tell the user about the error
+ console.log('load_log failed: status='+status+' error='+error);
+ $("#log-viewer .spinner").detach();
+ }
<% end %>
<% else %>
<%# Live log loading not implemented yet. %>
@@ -119,6 +173,10 @@ $("#set-show-failed-only").on("click", function() {
<% end %>
+
+ Download the full log
+
+
Log
@@ -217,6 +275,7 @@ $("#set-show-failed-only").on("click", function() {
+
<% end %>