inst-jobs 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55850c386085b90bbb9df7ff954d40ed7f2035268860ec8b47dfc11f11ec7e51
-  data.tar.gz: 53065a1f09e8cd30271bc9b57ab58d3bcfff8cf1b9590568379427093de9cbe9
+  metadata.gz: fb38d77d225501a3f9ca85561266adf7f2b873d187d0ee9e820e30f773fc5846
+  data.tar.gz: 0bdbb7e6609d0c228de6906b68ff41b7a5218b89832dd9f8958ed261d7a39fd2
 SHA512:
-  metadata.gz: 8f7d579cddb80890c6158a1384f6828ae91272a864308528ad84e6dc47b3e4769062f91de7ebf9641f4b766c21c571a419385ee57bec9b6e5531f39be30a50a8
-  data.tar.gz: 887648362dec636b3e1f6938e66dd25b97f42a3e606c5d8466768d5b2ed5137ea50b67c68ce9ec817df86f117ef0660f6ddd3456c86e4871965f89704cc161f3
+  metadata.gz: 76c59051987d523e8465c98a0aa03edfa7ee6df1fc090ebeb8238f827d3f5487dccd61f92c20acf87df9b53153de03bb866d577f44eb3d0db18bd3cd9fa44f66
+  data.tar.gz: 0262e34514a1919ff9715b1707d7c99dab2ddf4f3ef0c98e06441b61709ddb2bb36c763b73cc5a5512a03e2b2a253b507818da313213a621c40879d086fa9333

data/lib/delayed/rails_reloader_plugin.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "delayed/plugin"
+
+module Delayed
+  class RailsReloaderPlugin < Plugin
+    callbacks do |lifecycle|
+      app = Rails.application
+      if app && !app.config.cache_classes
+        lifecycle.around(:perform) do |worker, job, &block|
+          reload = !app.config.reload_classes_only_on_change || app.reloaders.any?(&:updated?)
+
+          if reload
+            if defined?(ActiveSupport::Reloader)
+              Rails.application.reloader.reload!
+            else
+              ActionDispatch::Reloader.prepare!
+            end
+          end
+
+          begin
+            block.call(worker, job)
+          ensure
+            ActionDispatch::Reloader.cleanup! if reload && !defined?(ActiveSupport::Reloader)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/lib/delayed/worker.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "delayed/rails_reloader_plugin"
+
 module Delayed
   class TimeoutError < RuntimeError; end
 
@@ -70,27 +72,7 @@ module Delayed
 
       @signal_queue = []
 
-      app = Rails.application
-      if app && !app.config.cache_classes
-        Delayed::Worker.lifecycle.around(:perform) do |worker, job, &block|
-          reload = app.config.reload_classes_only_on_change != true || app.reloaders.map(&:updated?).any?
-
-          if reload
-            if defined?(ActiveSupport::Reloader)
-              Rails.application.reloader.reload!
-            else
-              ActionDispatch::Reloader.prepare!
-            end
-          end
-
-          begin
-            block.call(worker, job)
-          ensure
-            ActionDispatch::Reloader.cleanup! if reload && !defined?(ActiveSupport::Reloader)
-          end
-        end
-      end
-
+      plugins << Delayed::RailsReloaderPlugin
       plugins.each(&:inject!)
     end
 

data/spec/delayed/worker_spec.rb

@@ -44,7 +44,7 @@ describe Delayed::Worker do
       expect(output_count).to eq(1)
     end
 
-    it "reloads" do
+    it "reloads Rails classes (never more than once)" do
       fake_application = double("Rails.application",
                                 config: double("Rails.application.config",
                                                cache_classes: false,
@@ -59,6 +59,11 @@ describe Delayed::Worker do
         expect(ActionDispatch::Reloader).to receive(:cleanup!).once
       end
       job = double(job_attrs)
+
+      # Create extra workers to make sure we don't reload multiple times
+      described_class.new(worker_config.dup)
+      described_class.new(worker_config.dup)
+
       subject.perform(job)
     end
   end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Cody Cutrer
 - Ethan Vizitei
 - Jacob Burroughs
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -424,7 +424,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description:
+description: 
 email:
 - cody@instructure.com
 - evizitei@instructure.com
@@ -483,6 +483,7 @@ files:
 - lib/delayed/periodic.rb
 - lib/delayed/plugin.rb
 - lib/delayed/pool.rb
+- lib/delayed/rails_reloader_plugin.rb
 - lib/delayed/server.rb
 - lib/delayed/server/helpers.rb
 - lib/delayed/server/public/css/app.css
@@ -531,7 +532,7 @@ files:
 homepage: https://github.com/instructure/inst-jobs
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -546,32 +547,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.24
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
 test_files:
-- spec/sample_jobs.rb
-- spec/spec_helper.rb
-- spec/shared_jobs_specs.rb
-- spec/shared/performable_method.rb
-- spec/shared/testing.rb
-- spec/shared/delayed_batch.rb
-- spec/shared/worker.rb
-- spec/shared/delayed_method.rb
-- spec/shared/shared_backend.rb
-- spec/migrate/20140924140513_add_story_table.rb
-- spec/delayed/server_spec.rb
+- spec/active_record_job_spec.rb
 - spec/delayed/cli_spec.rb
 - spec/delayed/daemon_spec.rb
-- spec/delayed/worker_spec.rb
-- spec/delayed/periodic_spec.rb
 - spec/delayed/message_sending_spec.rb
+- spec/delayed/periodic_spec.rb
+- spec/delayed/server_spec.rb
 - spec/delayed/settings_spec.rb
 - spec/delayed/work_queue/in_process_spec.rb
-- spec/delayed/work_queue/parent_process_spec.rb
 - spec/delayed/work_queue/parent_process/client_spec.rb
 - spec/delayed/work_queue/parent_process/server_spec.rb
-- spec/delayed/worker/health_check_spec.rb
+- spec/delayed/work_queue/parent_process_spec.rb
 - spec/delayed/worker/consul_health_check_spec.rb
-- spec/active_record_job_spec.rb
+- spec/delayed/worker/health_check_spec.rb
+- spec/delayed/worker_spec.rb
+- spec/migrate/20140924140513_add_story_table.rb
+- spec/sample_jobs.rb
+- spec/shared/delayed_batch.rb
+- spec/shared/delayed_method.rb
+- spec/shared/performable_method.rb
+- spec/shared/shared_backend.rb
+- spec/shared/testing.rb
+- spec/shared/worker.rb
+- spec/shared_jobs_specs.rb
+- spec/spec_helper.rb