mission_control-jobs 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c7ce16ee37335d17b00c145f7cfdeca380a031610dc47d03eebd7a42ca8771a
-  data.tar.gz: ac159740d425e2599a44209b10372f22b57541c4c3f110a48d024c99619a17ae
+  metadata.gz: 5cae6550d727f9f26c6b5c0f1259a03c7a3f802abe8eb025973fab559b8a8f73
+  data.tar.gz: 98a0bea82a4f3b9c3a3d338719f419508eef9ae05dbfc356314f142d053a4d11
 SHA512:
-  metadata.gz: 3b8db873d41d670e3653c2c0cf54dce91ffba77d8ecd0fde0469debd7fb2d24b193c57900d2f8679ae1a7142b760cc1d0f558302a398a6ceeb4a9ee36d45207d
-  data.tar.gz: 51b8e4693062abe8e4f4c405c8d35e20389b0b8269c7a730390c5a499fa7dfd16e79a0bb60ee88f689519bf59c5b6904a9792ee89165814176487fa0de18fb49
+  metadata.gz: 223fb6d226ef1511e88cac89f0b1176e5db6bd01899b49279012d1ed94e607c28491f4ec770c96848291d84748e6f2b3956812ee0a4f25a3b7a814557f3de259
+  data.tar.gz: 52e763ce4e3b3bb7d59881d284f1a136474b46b3cffba722db96f333e63538e7647f638fe5b67c427e5fb6bbdf96452f0dc7b216e04300ffd690d8197302161b

data/README.md

@@ -57,6 +57,7 @@ Besides `base_controller_class`, you can also set the following for `MissionCont
 - `internal_query_count_limit`: in count queries, the maximum number of records that will be counted if the adapter needs to limit these queries. True counts above this number will be returned as `INFINITY`. This keeps count queries fast—defaults to `500,000`
 - `scheduled_job_delay_threshold`: the time duration before a scheduled job is considered delayed. Defaults to `1.minute` (a job is considered delayed if it hasn't transitioned from the `scheduled` status 1 minute after the scheduled time).
 - `show_console_help`: whether to show the console help. If you don't want the console help message, set this to `false`—defaults to `true`.
+- `backtrace_cleaner`: a backtrace cleaner used for optionally filtering backtraces on the Failed Jobs detail page. Defaults to `Rails::BacktraceCleaner.new`. See the [Advanced configuration](#advanced-configuration) section for how to configure/override this setting on a per application/server basis.
 
 This library extends Active Job with a querying interface and the following setting:
 - `config.active_job.default_page_size`: the internal batch size that Active Job will use when sending queries to the underlying adapter and the batch size for the bulk operations defined above—defaults to `1000`.
@@ -65,7 +66,7 @@ This library extends Active Job with a querying interface and the following sett
 ## Adapter Specifics
 
 - **Resque**: Queue pausing is supported only if you have `resque-pause` installed in your project
-- **Solid Queue**: Requires version >= 0.9.
+- **Solid Queue**: Requires version >= 1.0.1.
 
 ## Advanced configuration
 
@@ -107,7 +108,24 @@ SERVERS_BY_APP.each do |app, servers|
       ActiveJob::QueueAdapters::SolidQueueAdapter.new
     end
 
-    [ server, queue_adapter ]
+    # Default:
+    # 
+    # @return Array<String, ActiveJob::QueueAdapters::Base)
+    # An array where:
+    # * the String represents the symbolic name for this server within the UI
+    # * ActiveJob::QueueAdapters::Base adapter instance used to access this Application Server/Service
+    [ server, queue_adapter ] 
+    
+    # Optional return formats:
+    # 
+    # @return Array<String, Array<ActiveJob::QueueAdapters::Base>>
+    # * This is equivalent, and behaves identically to, the format the default format above. 
+    # [ server, [ queue_adapter ]]  # without optional backtrace cleaner
+    # 
+    # @return Array<String, Array<ActiveJob::QueueAdapters::Base, ActiveSupport::BacktraceCleaner>>
+    # * This format adds an optional ActiveSupport::BacktraceCleaner to override the system wide
+    #   backtrace cleaner for *this* Application Server/Service.
+    # [ server, [ queue_adapter, BacktraceCleaner.new ]]  # with optional backtrace cleaner
   end.to_h
 
   MissionControl::Jobs.applications.add(app, queue_adapters_by_name)

data/app/assets/stylesheets/mission_control/jobs/jobs.css

@@ -2,6 +2,35 @@
     width: 15rem;
 }
 
-.jobs td {
-    word-break: break-all;
+table.jobs {
+    td {
+        word-break: break-all;
+    }
+    th.job-header{
+        width: 30%;
+    }
+    th.duration-header {
+        width: 20%;
+    }
+    &.queues th.job-header {
+        width: 30%;
+    }
+    &.failed th.job-header {
+        width: 35%;
+    }
+    &.in_progress th.job-header {
+        width: 50%;
+    }
+    &.blocked th.job-header {
+        width: 45%;
+    }
+    &.scheduled th.job-header {
+        width: 40%;
+    }
+    &.finished th.job-header {
+        width: 65%;
+    }
+    &.workers th.job-header {
+        width: 40%;
+    }
 }

data/app/controllers/mission_control/jobs/application_controller.rb

@@ -4,14 +4,8 @@ class MissionControl::Jobs::ApplicationController < MissionControl::Jobs.base_co
   include MissionControl::Jobs::ApplicationScoped, MissionControl::Jobs::NotFoundRedirections
   include MissionControl::Jobs::AdapterFeatures
 
-  around_action :set_current_locale
-
   private
     def default_url_options
       { server_id: MissionControl::Jobs::Current.server }
     end
-
-    def set_current_locale(&block)
-      I18n.with_locale(:en, &block)
-    end
 end

data/app/controllers/mission_control/jobs/discards_controller.rb

@@ -3,11 +3,16 @@ class MissionControl::Jobs::DiscardsController < MissionControl::Jobs::Applicati
 
   def create
     @job.discard
-    redirect_to application_jobs_url(@application, :failed), notice: "Discarded job with id #{@job.job_id}"
+    redirect_to redirect_location, notice: "Discarded job with id #{@job.job_id}"
   end
 
   private
     def jobs_relation
-      ActiveJob.jobs.failed
+      ActiveJob.jobs
+    end
+
+    def redirect_location
+      status = @job.status.presence_in(supported_job_statuses) || :failed
+      application_jobs_url(@application, status)
     end
 end

data/app/controllers/mission_control/jobs/dispatches_controller.rb

@@ -3,11 +3,16 @@ class MissionControl::Jobs::DispatchesController < MissionControl::Jobs::Applica
 
   def create
     @job.dispatch
-    redirect_to application_jobs_url(@application, :blocked), notice: "Dispatched job with id #{@job.job_id}"
+    redirect_to redirect_location, notice: "Dispatched job with id #{@job.job_id}"
   end
 
   private
-  def jobs_relation
-    ApplicationJob.jobs.blocked
-  end
+    def jobs_relation
+      ActiveJob.jobs
+    end
+
+    def redirect_location
+      status = @job.status.presence_in(supported_job_statuses) || :blocked
+      application_jobs_url(@application, status)
+    end
 end

data/app/controllers/mission_control/jobs/jobs_controller.rb

@@ -15,6 +15,7 @@ class MissionControl::Jobs::JobsController < MissionControl::Jobs::ApplicationCo
   end
 
   private
+
     def jobs_relation
       filtered_jobs
     end

data/app/controllers/mission_control/jobs/recurring_tasks_controller.rb

@@ -1,6 +1,6 @@
 class MissionControl::Jobs::RecurringTasksController < MissionControl::Jobs::ApplicationController
   before_action :ensure_supported_recurring_tasks
-  before_action :set_recurring_task, only: :show
+  before_action :set_recurring_task, only: [ :show, :update ]
 
   def index
     @recurring_tasks = MissionControl::Jobs::Current.server.recurring_tasks
@@ -10,6 +10,14 @@ class MissionControl::Jobs::RecurringTasksController < MissionControl::Jobs::App
     @jobs_page = MissionControl::Jobs::Page.new(@recurring_task.jobs, page: params[:page].to_i)
   end
 
+  def update
+    if (job = @recurring_task.enqueue) && job.successfully_enqueued?
+      redirect_to application_job_path(@application, job.job_id), notice: "Enqueued recurring task #{@recurring_task.id}"
+    else
+      redirect_to application_recurring_task_path(@application, @recurring_task), alert: "Something went wrong enqueuing this recurring task"
+    end
+  end
+
   private
     def ensure_supported_recurring_tasks
       unless recurring_tasks_supported?

data/app/helpers/mission_control/jobs/dates_helper.rb

@@ -1,19 +1,5 @@
 module MissionControl::Jobs::DatesHelper
-  def time_ago_in_words_with_title(time)
-    tag.span time_ago_in_words(time), title: time.to_fs(:long)
-  end
-
-  def time_distance_in_words_with_title(time)
-    tag.span distance_of_time_in_words_to_now(time, include_seconds: true), title: "Since #{time.to_fs(:long)}"
-  end
-
-  def bidirectional_time_distance_in_words_with_title(time)
-    time_distance = if time.past?
-      "#{distance_of_time_in_words_to_now(time, include_seconds: true)} ago"
-    else
-      "in #{distance_of_time_in_words_to_now(time, include_seconds: true)}"
-    end
-
-    tag.span time_distance, title: time.to_fs(:long)
+  def formatted_time(time)
+    time.in_time_zone.strftime("%Y-%m-%d %H:%M:%S.%3N %Z")
   end
 end

data/app/helpers/mission_control/jobs/jobs_helper.rb

@@ -11,17 +11,25 @@ module MissionControl::Jobs::JobsHelper
     "#{job.last_execution_error.error_class}: #{job.last_execution_error.message}"
   end
 
-  def failed_job_backtrace(job)
-    job.last_execution_error.backtrace.join("\n")
+  def clean_backtrace?
+    params["clean_backtrace"] == "true"
+  end
+
+  def failed_job_backtrace(job, server)
+    if clean_backtrace? && server&.backtrace_cleaner
+      server.backtrace_cleaner.clean(job.last_execution_error.backtrace).join("\n")
+    else
+      job.last_execution_error.backtrace.join("\n")
+    end
   end
 
   def attribute_names_for_job_status(status)
     case status.to_s
     when "failed"      then [ "Error", "" ]
-    when "blocked"     then [ "Queue", "Blocked by", "Block expiry", "" ]
+    when "blocked"     then [ "Queue", "Blocked by", "" ]
     when "finished"    then [ "Queue", "Finished" ]
     when "scheduled"   then [ "Queue", "Scheduled", "" ]
-    when "in_progress" then [ "Queue", "Run by", "Running for" ]
+    when "in_progress" then [ "Queue", "Run by", "Running since" ]
     else               []
     end
   end
@@ -31,6 +39,7 @@ module MissionControl::Jobs::JobsHelper
   end
 
   private
+
     def renderable_job_arguments_for(job)
       job.serialized_arguments.collect do |argument|
         as_renderable_argument(argument)

data/app/helpers/mission_control/jobs/navigation_helper.rb

@@ -47,6 +47,18 @@ module MissionControl::Jobs::NavigationHelper
 
   def jobs_count_with_status(status)
     count = ActiveJob.jobs.with_status(status).count
-    count.infinite? ? "..." : number_to_human(count)
+    if count.infinite?
+      "..."
+    else
+      number_to_human(count,
+        format: "%n%u",
+        units: {
+          thousand: "K",
+          million: "M",
+          billion: "B",
+          trillion: "T",
+          quadrillion: "Q"
+        })
+    end
   end
 end

data/app/models/mission_control/jobs/recurring_task.rb

@@ -1,7 +1,7 @@
 class MissionControl::Jobs::RecurringTask
   include ActiveModel::Model
 
-  attr_accessor :id, :job_class_name, :command, :arguments, :schedule, :last_enqueued_at, :queue_name, :priority
+  attr_accessor :id, :job_class_name, :command, :arguments, :schedule, :last_enqueued_at, :next_time, :queue_name, :priority
 
   def initialize(queue_adapter: ActiveJob::Base.queue_adapter, **kwargs)
     @queue_adapter = queue_adapter
@@ -12,6 +12,10 @@ class MissionControl::Jobs::RecurringTask
     ActiveJob::JobsRelation.new(queue_adapter: queue_adapter).where(recurring_task_id: id)
   end
 
+  def enqueue
+    queue_adapter.enqueue_recurring_task(id)
+  end
+
   private
     attr_reader :queue_adapter
 end

data/app/views/layouts/mission_control/jobs/application.html.erb

@@ -9,7 +9,7 @@
   <meta name="turbo-cache-control" content="no-cache">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.1/css/bulma.min.css">
   <%= stylesheet_link_tag "mission_control/jobs/application", "data-turbo-track": "reload" %>
-  <%= javascript_importmap_tags "application-mcj" %>
+  <%= javascript_importmap_tags "application", importmap: MissionControl::Jobs.importmap  %>
 </head>
 <body>
 

data/app/views/mission_control/jobs/jobs/_error_information.html.erb

@@ -14,5 +14,9 @@
     </tbody>
   </table>
 
-  <pre class="is-family-monospace mb-4"><%= failed_job_backtrace(job) %></pre>
+  <% if @server.backtrace_cleaner %>
+    <%= render "mission_control/jobs/jobs/failed/backtrace_toggle", application: @application, job: job %>
+  <% end %>
+
+  <pre class="is-family-monospace mb-4 backtrace-content"><%= failed_job_backtrace(job, @server) %></pre>
 <% end %>

data/app/views/mission_control/jobs/jobs/_filters.html.erb

@@ -14,15 +14,15 @@
 
         <%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
 
-        <datalist id="job-classes" style="display: none;">
+        <datalist id="job-classes" class="is-hidden">
           <% job_class_names.each do |job_class_name| %>
-            <option value="<%= job_class_name %>" />
+            <option value="<%= job_class_name %>"></option>
           <% end %>
         </datalist>
 
-        <datalist id="queue-names" style="display: none;">
+        <datalist id="queue-names" class="is-hidden">
           <% queue_names.each do |queue_name| %>
-            <option value="<%= queue_name %>" />
+            <option value="<%= queue_name %>"></option>
           <% end %>
         </datalist>
       <% end %>

data/app/views/mission_control/jobs/jobs/_general_information.html.erb

@@ -23,14 +23,25 @@
   <tr>
     <th>Enqueued</th>
     <td>
-      <%= time_ago_in_words_with_title(job.enqueued_at.to_datetime) %> ago
+      <%= formatted_time(job.enqueued_at.to_datetime) %>
     </td>
   </tr>
+  <% if job.scheduled? %>
+    <tr>
+      <th>Scheduled</th>
+      <td>
+        <%= formatted_time(job.scheduled_at) %>
+        <% if job_delayed?(job) %>
+          <div class="is-danger tag ml-4">delayed</div>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
   <% if job.failed? %>
     <tr>
       <th>Failed</th>
       <td>
-        <%= time_ago_in_words_with_title(job.failed_at) %> ago
+        <%= formatted_time(job.failed_at) %>
       </td>
     </tr>
   <% end %>
@@ -38,7 +49,7 @@
     <tr>
       <th>Finished at</th>
       <td>
-        <%= time_ago_in_words_with_title(job.finished_at) %> ago
+        <%= formatted_time(job.finished_at) %>
       </td>
     </tr>
   <% end %>

data/app/views/mission_control/jobs/jobs/_job.html.erb

@@ -6,7 +6,7 @@
       <div class="is-family-monospace"><%= job_arguments(job) %></div>
     <% end %>
 
-    <div class="has-text-grey is-size-7">Enqueued <%= time_ago_in_words_with_title(job.enqueued_at.to_datetime) %> ago</div>
+    <div class="has-text-grey is-size-7">Enqueued <%= formatted_time(job.enqueued_at.to_datetime) %></div>
   </td>
 
   <%= render "mission_control/jobs/jobs/#{jobs_status}/job", job: job %>

data/app/views/mission_control/jobs/jobs/_jobs_page.html.erb

@@ -1,7 +1,7 @@
 <table class="jobs <%= jobs_status %> table queues is-hoverable is-fullwidth">
   <thead>
     <tr>
-      <th style="width: 35%;">Job</th>
+      <th class="job-header">Job</th>
       <% attribute_names_for_job_status(jobs_status).each do |attribute| %>
         <th><%= attribute %></th>
       <% end %>

data/app/views/mission_control/jobs/jobs/_title.html.erb

@@ -11,6 +11,9 @@
       <% if job.blocked? %>
         <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>
       <% end %>
+      <% if job.scheduled? %>
+        <%= render "mission_control/jobs/jobs/scheduled/actions", job: job %>
+      <% end %>
     </div>
   </div>
 </h1>

data/app/views/mission_control/jobs/jobs/blocked/_actions.html.erb

@@ -1,3 +1,3 @@
 <div class="buttons is-right">
-  <%= button_to "Dispatch", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
+  <%= button_to "Run now", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
 </div>

data/app/views/mission_control/jobs/jobs/blocked/_job.html.erb

@@ -1,6 +1,7 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
-<td><div class="is-family-monospace is-size-7"><%= job.blocked_by %></div></td>
-<td><%= bidirectional_time_distance_in_words_with_title(job.blocked_until) %></td>
+<td><div class="is-family-monospace is-size-7"><%= job.blocked_by %></div>
+    <div class="has-text-grey is-size-7">Until <%= formatted_time(job.blocked_until) %></div>
+</td>
 <td class="pr-0">
   <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>
 </td>

data/app/views/mission_control/jobs/jobs/failed/_backtrace_toggle.html.erb

@@ -0,0 +1,14 @@
+<%# locals: (application:, job:) %>
+
+<div class="is-flex is-justify-content-flex-end mb-2 mr-2 backtrace-toggle-selector">
+  <div class="tabs is-toggle is-toggle-rounded is-small">
+    <ul>
+      <li class="<%= class_names('backtrace-clean-link', 'is-active' => clean_backtrace?) %>">
+        <%= link_to "Clean", application_job_path(application, job.job_id, clean_backtrace: true) %>
+      </li>
+      <li class="<%= class_names('backtrace-full-link', 'is-active' => !clean_backtrace?) %>">
+        <%= link_to "Full", application_job_path(application, job.job_id, clean_backtrace: false) %>
+      </li>
+    </ul>
+  </div>
+</div>

data/app/views/mission_control/jobs/jobs/failed/_job.html.erb

@@ -1,6 +1,6 @@
 <td>
   <%= link_to failed_job_error(job), application_job_path(@application, job.job_id, anchor: "error") %>
-  <div class="has-text-grey"><%= time_ago_in_words_with_title(job.failed_at) %> ago</div>
+  <div class="has-text-grey"><%= formatted_time(job.failed_at) %></div>
 </td>
 <td class="pr-0">
   <%= render "mission_control/jobs/jobs/failed/actions", job: job %>

data/app/views/mission_control/jobs/jobs/finished/_job.html.erb

@@ -1,2 +1,2 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
-<td><div class="has-text-grey"><%= time_ago_in_words_with_title(job.finished_at) %> ago</div></td>
+<td><div class="has-text-grey"><%= formatted_time(job.finished_at) %></div></td>

data/app/views/mission_control/jobs/jobs/in_progress/_job.html.erb

@@ -6,4 +6,4 @@
     —
   <% end %>
 </td>
-<td><div class="has-text-grey"><%= job.started_at ? time_distance_in_words_with_title(job.started_at) : "(Finished)" %></div></td>
+<td><div class="has-text-grey"><%= job.started_at ? formatted_time(job.started_at) : "(Finished)" %></div></td>

data/app/views/mission_control/jobs/jobs/scheduled/_actions.html.erb

@@ -1,4 +1,5 @@
 <div class="buttons is-right">
+  <%= button_to "Run now", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
   <%= button_to "Discard", application_job_discard_path(@application, job.job_id), class: "button is-danger is-light mr-0",
     form: { data: { turbo_confirm: "This will delete the job and can't be undone. Are you sure?" } } %>
 </div>

data/app/views/mission_control/jobs/jobs/scheduled/_job.html.erb

@@ -1,6 +1,6 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
 <td>
-  <%= bidirectional_time_distance_in_words_with_title(job.scheduled_at) %>
+  <%= formatted_time(job.scheduled_at) %>
   <% if job_delayed?(job) %>
     <div class="is-danger tag ml-4">delayed</div>
   <% end %>

data/app/views/mission_control/jobs/queues/_job.html.erb

@@ -3,7 +3,7 @@
     <%= link_to application_job_path(@application, job.job_id, filter: { queue_name: job.queue }) do %>
       <%= job_title(job) %>
     <% end %>
-    <div class="has-text-grey">Enqueued <%= time_ago_in_words_with_title(job.enqueued_at.to_datetime) %> ago</div>
+    <div class="has-text-grey">Enqueued on <%= formatted_time(job.enqueued_at.to_datetime) %></div>
   </td>
   <td>
     <% if job.serialized_arguments.present? %>

data/app/views/mission_control/jobs/queues/index.html.erb

@@ -4,8 +4,8 @@
   <tbody>
   <thead>
   <tr>
-    <th style="width: 50%;">Queue</th>
-    <th style="width: 30%;">Pending jobs</th>
+    <th>Queue</th>
+    <th>Pending jobs</th>
     <th></th>
   </tr>
   </thead>

data/app/views/mission_control/jobs/queues/show.html.erb

@@ -9,7 +9,7 @@
     <tbody>
     <thead>
     <tr>
-      <th style="width: 30%;">Job</th>
+      <th class="job-header">Job</th>
       <th></th>
     </tr>
     </thead>

data/app/views/mission_control/jobs/recurring_tasks/_actions.html.erb

@@ -0,0 +1,3 @@
+<div class="buttons is-right">
+  <%= button_to "Run now", application_recurring_task_path(@application, recurring_task.id), class: "button is-warning is-light mr-0", method: :put %>
+</div>

data/app/views/mission_control/jobs/recurring_tasks/_recurring_task.html.erb

@@ -14,5 +14,9 @@
     <% end %>
   </td>
   <td> <%= recurring_task.schedule %> </td>
-  <td><div class="has-text-grey"><%= recurring_task.last_enqueued_at ? bidirectional_time_distance_in_words_with_title(recurring_task.last_enqueued_at) : "Never" %></div></td>
+  <td><div class="has-text-grey"><%= recurring_task.last_enqueued_at ? formatted_time(recurring_task.last_enqueued_at) : "Never" %></div></td>
+  <td class="next_time"><div class="has-text-grey"><%= formatted_time(recurring_task.next_time) %></div></td>
+  <td class="pr-0">
+    <%= render "mission_control/jobs/recurring_tasks/actions", recurring_task: recurring_task %>
+  </td>
 </tr>

data/app/views/mission_control/jobs/recurring_tasks/_title.html.erb

@@ -3,5 +3,8 @@
     <div class="level-left">
       <%= recurring_task.id %>
     </div>
+    <div class="level-right">
+      <%= render "mission_control/jobs/recurring_tasks/actions", recurring_task: recurring_task %>
+    </div>
   </div>
 </h1>

data/app/views/mission_control/jobs/recurring_tasks/index.html.erb

@@ -7,7 +7,9 @@
     <th></th>
     <th>Job</th>
     <th>Schedule</th>
-    <th>Last enqueued at</th>
+    <th>Last enqueued</th>
+    <th>Next</th>
+    <th></th>
   </tr>
   </thead>
 

data/app/views/mission_control/jobs/shared/_job.html.erb

@@ -3,7 +3,7 @@
     <%= link_to application_job_path(@application, job.job_id, filter: { queue_name: job.queue }) do %>
       <%= job_title(job) %>
     <% end %>
-    <div class="has-text-grey">Enqueued <%= time_ago_in_words_with_title(job.enqueued_at.to_datetime) %> ago</div>
+    <div class="has-text-grey">Enqueued on <%= formatted_time(job.enqueued_at.to_datetime) %></div>
   </td>
   <td>
     <% if job.serialized_arguments.present? %>
@@ -16,9 +16,9 @@
   <td>
     <div class="has-text-grey">
       <% if job.started_at %>
-        Running for <%= time_distance_in_words_with_title(job.started_at) %>
+        Running since <%= formatted_time(job.started_at) %>
       <% elsif job.finished_at %>
-        Finished <%= time_ago_in_words_with_title(job.finished_at) %> ago
+        Finished on <%= formatted_time(job.finished_at) %>
       <% else %>
         Pending
       <% end %>

data/app/views/mission_control/jobs/shared/_jobs.html.erb

@@ -2,9 +2,9 @@
   <tbody>
   <thead>
   <tr>
-    <th style="width: 30%;">Job</th>
+    <th class="job-header">Job</th>
     <th></th>
-    <th style="width: 20%;"></th>
+    <th class="duration-header"></th>
   </tr>
   </thead>
 

data/app/views/mission_control/jobs/workers/_worker.html.erb

@@ -17,5 +17,5 @@
     <% end %>
   </td>
 
-  <td><div class="has-text-grey"><%= time_ago_in_words_with_title(worker.last_heartbeat_at) %> ago</div></td>
+  <td><div class="has-text-grey"><%= formatted_time(worker.last_heartbeat_at) %></div></td>
 </tr>

data/app/views/mission_control/jobs/workers/_workers_page.html.erb

@@ -4,7 +4,7 @@
   <tr>
     <th>Worker</th>
     <th>Hostname</th>
-    <th style="width: 35%;">Jobs</th>
+    <th class="job-header">Jobs</th>
     <th>Last heartbeat</th>
   </tr>
   </thead>

data/config/importmap.rb

@@ -1,4 +1,4 @@
-pin "application-mcj", to: "mission_control/jobs/application.js", preload: true
+pin "application", to: "mission_control/jobs/application.js", preload: true
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true

data/config/routes.rb

@@ -20,7 +20,7 @@ MissionControl::Jobs::Engine.routes.draw do
     resources :jobs, only: :index, path: ":status/jobs"
 
     resources :workers, only: [ :index, :show ]
-    resources :recurring_tasks, only: [ :index, :show ]
+    resources :recurring_tasks, only: [ :index, :show, :update ]
   end
 
   # Allow referencing urls without providing an application_id. It will default to the first one.

data/lib/active_job/executing.rb

@@ -25,7 +25,7 @@ module ActiveJob::Executing
   end
 
   def dispatch
-    ActiveJob.jobs.blocked.dispatch_job(self)
+    ActiveJob.jobs.dispatch_job(self)
   end
 
   private

data/lib/active_job/jobs_relation.rb

@@ -154,7 +154,12 @@ class ActiveJob::JobsRelation
   end
 
   # Dispatch the provided job.
+  #
+  # This operation is only valid for blocked or scheduled jobs. It will
+  # raise an error +ActiveJob::Errors::InvalidOperation+ otherwise.
   def dispatch_job(job)
+    raise ActiveJob::Errors::InvalidOperation, "This operation can only be performed on blocked or scheduled jobs, but this job is #{job.status}" unless job.blocked? || job.scheduled?
+
     queue_adapter.dispatch_job(job, self)
   end
 

data/lib/active_job/queue_adapters/async_ext.rb

@@ -0,0 +1,49 @@
+module ActiveJob::QueueAdapters::AsyncExt
+  include MissionControl::Jobs::Adapter
+
+  # List of filters supported natively. Non-supported filters are done in memory.
+  def supported_job_filters(jobs_relation)
+    []
+  end
+
+  def supports_queue_pausing?
+    false
+  end
+
+  def queues
+    []
+  end
+
+  def queue_size(*)
+    0
+  end
+
+  def clear_queue(*)
+  end
+
+  def jobs_count(*)
+    0
+  end
+
+  def fetch_jobs(*)
+    []
+  end
+
+  def retry_all_jobs(*)
+  end
+
+  def retry_job(job, *)
+  end
+
+  def discard_all_jobs(*)
+  end
+
+  def discard_job(*)
+  end
+
+  def dispatch_job(*)
+  end
+
+  def find_job(*)
+  end
+end

data/lib/active_job/queue_adapters/resque_ext.rb

@@ -190,7 +190,7 @@ module ActiveJob::QueueAdapters::ResqueExt
             job.last_execution_error = execution_error_from_resque_job(resque_job_hash)
             job.raw_data = resque_job_hash
             job.position = jobs_relation.offset_value + index
-            job.failed_at = resque_job_hash["failed_at"]&.to_datetime
+            job.failed_at = resque_job_hash["failed_at"]&.to_datetime&.utc
             job.status = job.failed_at.present? ? :failed : :pending
           end
         end
@@ -263,7 +263,7 @@ module ActiveJob::QueueAdapters::ResqueExt
 
         def requeue(job)
           resque_job = job.raw_data
-          resque_job["retried_at"] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
+          resque_job["retried_at"] = Time.now.utc.strftime("%Y/%m/%d %H:%M:%S")
 
           redis.lset(queue_redis_key, job.position, Resque.encode(resque_job))
           Resque::Job.create(resque_job["queue"], resque_job["payload"]["class"], *resque_job["payload"]["args"])

data/lib/active_job/queue_adapters/solid_queue_ext/recurring_tasks.rb

@@ -20,6 +20,12 @@ module ActiveJob::QueueAdapters::SolidQueueExt::RecurringTasks
     end
   end
 
+  def enqueue_recurring_task(task_id)
+    if task = SolidQueue::RecurringTask.find_by(key: task_id)
+      task.enqueue(at: Time.now)
+    end
+  end
+
   private
     def recurring_task_attributes_from_solid_queue_recurring_task(task)
       {
@@ -28,6 +34,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt::RecurringTasks
         command: task.command,
         arguments: task.arguments,
         schedule: task.schedule,
+        next_time: task.next_time,
         queue_name: task.queue_name,
         priority: task.priority
       }

data/lib/active_job/queue_adapters/solid_queue_ext.rb

@@ -123,9 +123,13 @@ module ActiveJob::QueueAdapters::SolidQueueExt
     end
 
     def dispatch_immediately(job)
-      SolidQueue::Job.transaction do
-        job.dispatch_bypassing_concurrency_limits
-        job.blocked_execution.destroy!
+      if job.blocked?
+        SolidQueue::Job.transaction do
+          job.dispatch_bypassing_concurrency_limits
+          job.blocked_execution.destroy!
+        end
+      else
+        job.scheduled_execution.update!(scheduled_at: Time.now)
       end
     end
 

data/lib/mission_control/jobs/application.rb

@@ -11,7 +11,10 @@ class MissionControl::Jobs::Application
 
   def add_servers(queue_adapters_by_name)
     queue_adapters_by_name.each do |name, queue_adapter|
-      servers << MissionControl::Jobs::Server.new(name: name.to_s, queue_adapter: queue_adapter, application: self)
+      adapter, cleaner = queue_adapter
+
+      servers << MissionControl::Jobs::Server.new(name: name.to_s, queue_adapter: adapter,
+        backtrace_cleaner: cleaner, application: self)
     end
   end
 end

data/lib/mission_control/jobs/engine.rb

@@ -1,6 +1,3 @@
-require "mission_control/jobs/version"
-require "mission_control/jobs/engine"
-
 require "importmap-rails"
 require "turbo-rails"
 require "stimulus-rails"
@@ -15,6 +12,7 @@ module MissionControl
 
       config.before_initialize do
         config.mission_control.jobs.applications = MissionControl::Jobs::Applications.new
+        config.mission_control.jobs.backtrace_cleaner ||= Rails::BacktraceCleaner.new
 
         config.mission_control.jobs.each do |key, value|
           MissionControl::Jobs.public_send("#{key}=", value)
@@ -45,7 +43,7 @@ module MissionControl
           ActiveJob::QueueAdapters::SolidQueueAdapter.prepend ActiveJob::QueueAdapters::SolidQueueExt
         end
 
-        ActiveJob::QueueAdapters::AsyncAdapter.include MissionControl::Jobs::Adapter
+        ActiveJob::QueueAdapters::AsyncAdapter.include ActiveJob::QueueAdapters::AsyncExt
       end
 
       config.after_initialize do |app|
@@ -76,11 +74,6 @@ module MissionControl
         MissionControl::Jobs.delay_between_bulk_operation_batches = 2
         MissionControl::Jobs.logger = ActiveSupport::Logger.new(STDOUT)
 
-        if MissionControl::Jobs.applications.one? && (application = MissionControl::Jobs.applications.first) && application.servers.one?
-          MissionControl::Jobs::Current.application = application
-          MissionControl::Jobs::Current.server = application.servers.first
-        end
-
         if MissionControl::Jobs.show_console_help
           puts "\n\nType 'jobs_help' to see how to connect to the available job servers to manage jobs\n\n"
         end
@@ -91,9 +84,13 @@ module MissionControl
         app.config.assets.precompile += %w[ mission_control_jobs_manifest ]
       end
 
-      initializer "mission_control-jobs.importmap", before: "importmap" do |app|
-        app.config.importmap.paths << root.join("config/importmap.rb")
-        app.config.importmap.cache_sweepers << root.join("app/javascript")
+      initializer "mission_control-jobs.importmap", after: "importmap" do |app|
+        MissionControl::Jobs.importmap.draw(root.join("config/importmap.rb"))
+        MissionControl::Jobs.importmap.cache_sweeper(watches: root.join("app/javascript"))
+
+        ActiveSupport.on_load(:action_controller_base) do
+          before_action { MissionControl::Jobs.importmap.cache_sweeper.execute_if_updated }
+        end
       end
     end
   end

data/lib/mission_control/jobs/server.rb

@@ -4,12 +4,13 @@ class MissionControl::Jobs::Server
   include MissionControl::Jobs::IdentifiedByName
   include Serializable, RecurringTasks, Workers
 
-  attr_reader :name, :queue_adapter, :application
+  attr_reader :name, :queue_adapter, :application, :backtrace_cleaner
 
-  def initialize(name:, queue_adapter:, application:)
+  def initialize(name:, queue_adapter:, application:, backtrace_cleaner: nil)
     super(name: name)
     @queue_adapter = queue_adapter
     @application = application
+    @backtrace_cleaner = backtrace_cleaner || MissionControl::Jobs.backtrace_cleaner
   end
 
   def activating(&block)

data/lib/mission_control/jobs/version.rb

@@ -1,5 +1,5 @@
 module MissionControl
   module Jobs
-    VERSION = "0.3.3"
+    VERSION = "0.5.0"
   end
 end

data/lib/mission_control/jobs.rb

@@ -19,5 +19,7 @@ module MissionControl
     mattr_accessor :internal_query_count_limit, default: 500_000 # Hard limit to keep unlimited count queries fast enough
     mattr_accessor :show_console_help, default: true
     mattr_accessor :scheduled_job_delay_threshold, default: 1.minute
+    mattr_accessor :importmap, default: Importmap::Map.new
+    mattr_accessor :backtrace_cleaner
   end
 end

metadata

@@ -1,17 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: mission_control-jobs
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-16 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: actioncable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -30,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +154,16 @@ dependencies:
   name: solid_queue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: better_html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -341,6 +411,7 @@ files:
 - app/views/mission_control/jobs/jobs/blocked/_actions.html.erb
 - app/views/mission_control/jobs/jobs/blocked/_job.html.erb
 - app/views/mission_control/jobs/jobs/failed/_actions.html.erb
+- app/views/mission_control/jobs/jobs/failed/_backtrace_toggle.html.erb
 - app/views/mission_control/jobs/jobs/failed/_job.html.erb
 - app/views/mission_control/jobs/jobs/finished/_job.html.erb
 - app/views/mission_control/jobs/jobs/in_progress/_job.html.erb
@@ -354,6 +425,7 @@ files:
 - app/views/mission_control/jobs/queues/_queue_title.html.erb
 - app/views/mission_control/jobs/queues/index.html.erb
 - app/views/mission_control/jobs/queues/show.html.erb
+- app/views/mission_control/jobs/recurring_tasks/_actions.html.erb
 - app/views/mission_control/jobs/recurring_tasks/_general_information.html.erb
 - app/views/mission_control/jobs/recurring_tasks/_recurring_task.html.erb
 - app/views/mission_control/jobs/recurring_tasks/_title.html.erb
@@ -381,6 +453,7 @@ files:
 - lib/active_job/jobs_relation.rb
 - lib/active_job/querying.rb
 - lib/active_job/queue.rb
+- lib/active_job/queue_adapters/async_ext.rb
 - lib/active_job/queue_adapters/resque_ext.rb
 - lib/active_job/queue_adapters/solid_queue_ext.rb
 - lib/active_job/queue_adapters/solid_queue_ext/recurring_tasks.rb