diff --git a/Gemfile b/Gemfile index 1ac5513e..dc34b637 100644 --- a/Gemfile +++ b/Gemfile @@ -7,4 +7,3 @@ gemspec gem "mysql2", "~> 0.5.6" gem "trilogy", "~> 2.7.0" gem "rspec", "~> 3.13" - diff --git a/delayed_job_modern_record.gemspec b/delayed_job_modern_record.gemspec index 2a59f8ac..eb5c91b4 100644 --- a/delayed_job_modern_record.gemspec +++ b/delayed_job_modern_record.gemspec @@ -1,18 +1,18 @@ # frozen_string_literal: true Gem::Specification.new do |spec| - spec.name = "delayed_job_moden_record" - spec.version = "0.0.1" - spec.summary = "Modern ActiveRecord backend for DelayedJob" + spec.name = "delayed_job_moden_record" + spec.version = "0.0.1" + spec.summary = "Modern ActiveRecord backend for DelayedJob" spec.description = "Modern ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke" spec.licenses = "MIT" - spec.authors = ["Arkency"] - spec.email = ["dev@arkency.com"] + spec.authors = ["Arkency"] + spec.email = ["dev@arkency.com"] spec.homepage = "http://github.com/arkency/delayed_job_modern_record" - spec.files = %w[CONTRIBUTING.md LICENSE.md README.md delayed_job_modern_record.gemspec] + Dir["lib/**/*.rb"] + spec.files = %w[CONTRIBUTING.md LICENSE.md README.md delayed_job_modern_record.gemspec] + Dir["lib/**/*.rb"] spec.require_paths = ["lib"] spec.metadata = { "rubygems_mfa_required" => "true" } @@ -20,5 +20,5 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 3.3.0" spec.add_dependency "activerecord", [">= 7.1", "< 8.0"] - spec.add_dependency "delayed_job", [">= 4.1.11", "< 5"] + spec.add_dependency "delayed_job", [">= 4.1.11", "< 5"] end diff --git a/lib/delayed/backend/modern_record.rb b/lib/delayed/backend/modern_record.rb index b65e4379..fdfb5d9e 100644 --- a/lib/delayed/backend/modern_record.rb +++ b/lib/delayed/backend/modern_record.rb @@ -29,25 +29,15 @@ def self.ready_to_run(worker_name, max_run_time) ) end - def self.before_fork - ::ActiveRecord::Base.connection_handler.clear_all_connections!(:all) - end - - def self.after_fork - ::ActiveRecord::Base.establish_connection - end + def self.before_fork = ::ActiveRecord::Base.connection_handler.clear_all_connections!(:all) + def self.after_fork = ::ActiveRecord::Base.establish_connection def self.clear_locks!(worker_name) where(locked_by: worker_name).update_all(locked_by: nil, locked_at: nil) end def self.reserve(worker, max_run_time = Worker.max_run_time) - ready_scope = - ready_to_run(worker.name, max_run_time) - .min_priority - .max_priority - .for_queues - .by_priority + ready_scope = ready_to_run(worker.name, max_run_time).min_priority.max_priority.for_queues.by_priority now = db_time_now.change(usec: 0) count = ready_scope.limit(1).update_all(locked_at: now, locked_by: worker.name) diff --git a/lib/delayed_job_modern_record.rb b/lib/delayed_job_modern_record.rb index c13a4ac4..5890b14b 100644 --- a/lib/delayed_job_modern_record.rb +++ b/lib/delayed_job_modern_record.rb @@ -4,4 +4,4 @@ require "delayed_job" require "delayed/backend/modern_record" -Delayed::Worker.backend = Delayed::Backend::ModernRecord::Job \ No newline at end of file +Delayed::Worker.backend = Delayed::Backend::ModernRecord::Job diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ed81f289..17c9d0b8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -45,4 +45,4 @@ def whatever(number) = tell * number default_scope { where(scoped: true) } handle_asynchronously :whatever -end \ No newline at end of file +end