good_job 2.1.0 → 2.2.0

data/lib/good_job/job_performer.rb

@@ -14,8 +14,8 @@ module GoodJob
     def initialize(queue_string)
       @queue_string = queue_string
 
-      @job_query = Concurrent::Delay.new { GoodJob::Job.queue_string(queue_string) }
-      @parsed_queues = Concurrent::Delay.new { GoodJob::Job.queue_parser(queue_string) }
+      @job_query = Concurrent::Delay.new { GoodJob::Execution.queue_string(queue_string) }
+      @parsed_queues = Concurrent::Delay.new { GoodJob::Execution.queue_parser(queue_string) }
     end
 
     # A meaningful name to identify the performer in logs and for debugging.

data/lib/good_job/log_subscriber.rb

@@ -19,10 +19,10 @@ module GoodJob
     #   @return [void]
     def create(event)
       # FIXME: This method does not match any good_job notifications.
-      good_job = event.payload[:good_job]
+      execution = event.payload[:execution]
 
       debug do
-        "GoodJob created job resource with id #{good_job.id}"
+        "GoodJob created job resource with id #{execution.id}"
       end
     end
 
@@ -96,12 +96,12 @@ module GoodJob
 
     # @!macro notification_responder
     def perform_job(event)
-      good_job = event.payload[:good_job]
+      execution = event.payload[:execution]
       process_id = event.payload[:process_id]
       thread_name = event.payload[:thread_name]
 
       info(tags: [process_id, thread_name]) do
-        "Executed GoodJob #{good_job.id}"
+        "Executed GoodJob #{execution.id}"
       end
     end
 

data/lib/good_job/notifier.rb

@@ -39,7 +39,7 @@ module GoodJob # :nodoc:
     # Send a message via Postgres NOTIFY
     # @param message [#to_json]
     def self.notify(message)
-      connection = Job.connection
+      connection = Execution.connection
       connection.exec_query <<~SQL.squish
         NOTIFY #{CHANNEL}, #{connection.quote(message.to_json)}
       SQL
@@ -169,8 +169,8 @@ module GoodJob # :nodoc:
     end
 
     def with_listen_connection
-      ar_conn = Job.connection_pool.checkout.tap do |conn|
-        Job.connection_pool.remove(conn)
+      ar_conn = Execution.connection_pool.checkout.tap do |conn|
+        Execution.connection_pool.remove(conn)
       end
       pg_conn = ar_conn.raw_connection
       raise AdapterCannotListenError unless pg_conn.respond_to? :wait_for_notify

data/lib/good_job/railtie.rb

@@ -14,11 +14,11 @@ module GoodJob
 
     initializer "good_job.active_job_notifications" do
       ActiveSupport::Notifications.subscribe "enqueue_retry.active_job" do |event|
-        GoodJob::CurrentExecution.error_on_retry = event.payload[:error]
+        GoodJob::CurrentThread.error_on_retry = event.payload[:error]
       end
 
       ActiveSupport::Notifications.subscribe "discard.active_job" do |event|
-        GoodJob::CurrentExecution.error_on_discard = event.payload[:error]
+        GoodJob::CurrentThread.error_on_discard = event.payload[:error]
       end
     end
 

data/lib/good_job/scheduler.rb

@@ -244,8 +244,8 @@ module GoodJob # :nodoc:
     def instrument(name, payload = {}, &block)
       payload = payload.reverse_merge({
                                         scheduler: self,
-                                        process_id: GoodJob::CurrentExecution.process_id,
-                                        thread_name: GoodJob::CurrentExecution.thread_name,
+                                        process_id: GoodJob::CurrentThread.process_id,
+                                        thread_name: GoodJob::CurrentThread.thread_name,
                                       })
 
       ActiveSupport::Notifications.instrument("#{name}.good_job", payload, &block)

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/good_job.rb

@@ -20,7 +20,7 @@ require "good_job/railtie"
 module GoodJob
   # @!attribute [rw] active_record_parent_class
   #   @!scope class
-  #   The ActiveRecord parent class inherited by +GoodJob::Job+ (default: +ActiveRecord::Base+).
+  #   The ActiveRecord parent class inherited by +GoodJob::Execution+ (default: +ActiveRecord::Base+).
   #   Use this when using multiple databases or other custom ActiveRecord configuration.
   #   @return [ActiveRecord::Base]
   #   @example Change the base class:
@@ -129,7 +129,7 @@ module GoodJob
     timestamp = Time.current - older_than
 
     ActiveSupport::Notifications.instrument("cleanup_preserved_jobs.good_job", { older_than: older_than, timestamp: timestamp }) do |payload|
-      deleted_records_count = GoodJob::Job.finished(timestamp).delete_all
+      deleted_records_count = GoodJob::Execution.finished(timestamp).delete_all
 
       payload[:deleted_records_count] = deleted_records_count
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -354,13 +354,15 @@ files:
 - engine/app/controllers/good_job/active_jobs_controller.rb
 - engine/app/controllers/good_job/assets_controller.rb
 - engine/app/controllers/good_job/base_controller.rb
+- engine/app/controllers/good_job/cron_schedules_controller.rb
 - engine/app/controllers/good_job/dashboards_controller.rb
-- engine/app/controllers/good_job/jobs_controller.rb
+- engine/app/controllers/good_job/executions_controller.rb
 - engine/app/helpers/good_job/application_helper.rb
 - engine/app/views/good_job/active_jobs/show.html.erb
+- engine/app/views/good_job/cron_schedules/index.html.erb
 - engine/app/views/good_job/dashboards/index.html.erb
 - engine/app/views/good_job/shared/_chart.erb
-- engine/app/views/good_job/shared/_jobs_table.erb
+- engine/app/views/good_job/shared/_executions_table.erb
 - engine/app/views/good_job/shared/icons/_check.html.erb
 - engine/app/views/good_job/shared/icons/_exclamation.html.erb
 - engine/app/views/good_job/shared/icons/_trash.html.erb
@@ -380,8 +382,9 @@ files:
 - lib/good_job/cli.rb
 - lib/good_job/configuration.rb
 - lib/good_job/cron_manager.rb
-- lib/good_job/current_execution.rb
+- lib/good_job/current_thread.rb
 - lib/good_job/daemon.rb
+- lib/good_job/execution.rb
 - lib/good_job/execution_result.rb
 - lib/good_job/job.rb
 - lib/good_job/job_performer.rb

data/engine/app/controllers/good_job/jobs_controller.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-module GoodJob
-  class JobsController < GoodJob::BaseController
-    def destroy
-      deleted_count = GoodJob::Job.where(id: params[:id]).delete_all
-      message = deleted_count.positive? ? { notice: "Job deleted" } : { alert: "Job not deleted" }
-      redirect_to root_path, **message
-    end
-  end
-end

data/engine/app/views/good_job/shared/_jobs_table.erb

@@ -1,48 +0,0 @@
-<div class="card my-3">
-  <div class="table-responsive">
-    <table class="table card-table table-bordered table-hover table-sm mb-0">
-      <thead>
-        <tr>
-          <th>GoodJob ID</th>
-          <th>ActiveJob ID</th>
-          <th>Job Class</th>
-          <th>Queue</th>
-          <th>Scheduled At</th>
-          <th>Error</th>
-          <th>
-            ActiveJob Params&nbsp;
-            <%= tag.button "Toggle", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
-                           data: { bs_toggle: "collapse", bs_target: ".job-params" },
-                           aria: { expanded: false, controls: jobs.map { |job| "##{dom_id(job, "params")}" }.join(" ") }
-            %>
-          </th>
-          <th>Actions</th>
-        </tr>
-      </thead>
-      <tbody>
-        <% jobs.each do |job| %>
-          <tr id="<%= dom_id(job) %>">
-            <td><%= link_to job.id, active_job_path(job.serialized_params['job_id'], anchor: dom_id(job)) %></td>
-            <td><%= link_to job.serialized_params['job_id'], active_job_path(job.serialized_params['job_id']) %></td>
-            <td><%= job.serialized_params['job_class'] %></td>
-            <td><%= job.queue_name %></td>
-            <td><%= job.scheduled_at || job.created_at %></td>
-            <td class="text-break"><%= truncate(job.error, length: 1_000) %></td>
-            <td>
-              <%= tag.button "Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
-                data: { bs_toggle: "collapse", bs_target: "##{dom_id(job, 'params')}" },
-                aria: { expanded: false, controls: dom_id(job, "params") }
-              %>
-              <%= tag.pre JSON.pretty_generate(job.serialized_params), id: dom_id(job, "params"), class: "collapse job-params" %>
-            </td>
-            <td>
-              <%= button_to job_path(job.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete job" do %>
-                <%= render "good_job/shared/icons/trash" %>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-</div>