diff --git a/app/helpers/mission_control/jobs/jobs_helper.rb b/app/helpers/mission_control/jobs/jobs_helper.rb index 146504bc..81249088 100644 --- a/app/helpers/mission_control/jobs/jobs_helper.rb +++ b/app/helpers/mission_control/jobs/jobs_helper.rb @@ -25,7 +25,7 @@ def failed_job_backtrace(job, server) def attribute_names_for_job_status(status) case status.to_s - when "failed" then [ "Error", "" ] + when "failed" then [ "Error", "Retries", "" ] when "blocked" then [ "Queue", "Blocked by", "" ] when "finished" then [ "Queue", "Finished" ] when "scheduled" then [ "Queue", "Scheduled", "" ] diff --git a/app/views/mission_control/jobs/jobs/_general_information.html.erb b/app/views/mission_control/jobs/jobs/_general_information.html.erb index 0b15d7f5..18218449 100644 --- a/app/views/mission_control/jobs/jobs/_general_information.html.erb +++ b/app/views/mission_control/jobs/jobs/_general_information.html.erb @@ -45,6 +45,12 @@ <% end %> + + Retries + + <%= job.retries %> + + <% if job.finished_at.present? %> Finished at diff --git a/app/views/mission_control/jobs/jobs/failed/_job.html.erb b/app/views/mission_control/jobs/jobs/failed/_job.html.erb index 5291336c..259498e7 100644 --- a/app/views/mission_control/jobs/jobs/failed/_job.html.erb +++ b/app/views/mission_control/jobs/jobs/failed/_job.html.erb @@ -2,6 +2,9 @@ <%= link_to failed_job_error(job), application_job_path(@application, job.job_id, anchor: "error") %>
<%= formatted_time(job.failed_at) %>
+ + <%= job.retries %> + <%= render "mission_control/jobs/jobs/failed/actions", job: job %> diff --git a/lib/active_job/job_proxy.rb b/lib/active_job/job_proxy.rb index 623415fb..5bf27c13 100644 --- a/lib/active_job/job_proxy.rb +++ b/lib/active_job/job_proxy.rb @@ -20,6 +20,10 @@ def serialize end end + def retries + arguments.first["executions"] || 0 + end + def perform_now raise UnsupportedError, "A JobProxy doesn't support immediate execution, only enqueuing." end