X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cbba74fcd57b7b81337d44c2e663ba317e6538de..21598295f38998d8028aaa117f192de6b5758808:/apps/workbench/app/views/work_units/_show_log.html.erb diff --git a/apps/workbench/app/views/work_units/_show_log.html.erb b/apps/workbench/app/views/work_units/_show_log.html.erb index 6a0916fe98..323c9e88c7 100644 --- a/apps/workbench/app/views/work_units/_show_log.html.erb +++ b/apps/workbench/app/views/work_units/_show_log.html.erb @@ -9,12 +9,15 @@ <% end %> -<%# Show log in terminal window %> +<% live_log_lines = wu.live_log_lines(Rails.configuration.running_job_log_records_to_fetch).join("\n") %> +<% if !render_log or (live_log_lines.size > 0) %> +<%# Still running, or recently finished and logs are still available from logs table %> +<%# Show recent logs in terminal window %>

Recent logs

<%= wu.live_log_lines(Rails.configuration.running_job_log_records_to_fetch).join("\n") %> + ><%= live_log_lines %>
<%# Applying a long throttle suppresses the auto-refresh of this @@ -22,3 +25,4 @@
>
+<% end %>