delayed_job_master 2.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f6ec1ebe00243f5d69adf6a92a6e2716772b7a9af68b7301220bae2cfc55d7
-  data.tar.gz: 30db6bc4a8183622514a9e4fcad3f5130e3061cff0bb973b834e5e0c9db5ffb0
+  metadata.gz: 2352f0e35b9bf06ef9362e797ea35d8b848583d03d8aea62235497dc8b938cc9
+  data.tar.gz: 205e1a4b04a8ad361ff0122acc65bcaa02439eaf5bbe91a258652dfa02d79eb9
 SHA512:
-  metadata.gz: 6958a025ee232142b6a3049b25ea62075a08dea1446ddc0b29ee3f26d5ef1dd9351e6df46a2ad2a8d8068238e44a84bce6140639ff62aa8a0c8f2ad0ba43c2fe
-  data.tar.gz: c863131bde412c128fc3f144fd5ba1bb472cd8850a0c31a32d0500e043572e389ce7184c6a98a0b57de31bd5c434601c5641c64ea00b7a7db1a41bd11095f4dc
+  metadata.gz: f02b0683502467943f0e1e81543705b7d69febdcf22a846d05525a95fa13844552c6d3215df4f2b87fbfdf859d9178eb18350d746a8f92743752ac0cfa2f44f2
+  data.tar.gz: 104a01e051fce6f6fba061c38e1674a8c3a8bd23d9ae367399a9825fc0a560fc8657dd863d6dca053c734761b93160d70b50c5356343ec12320b572b8937f019

data/.github/workflows/ci.yml

@@ -0,0 +1,61 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1]
+        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70']
+        exclude:
+          - ruby: 2.3
+            gemfile: rails60
+          - ruby: 2.3
+            gemfile: rails61
+          - ruby: 2.3
+            gemfile: rails70
+          - ruby: 2.4
+            gemfile: rails60
+          - ruby: 2.4
+            gemfile: rails61
+          - ruby: 2.4
+            gemfile: rails70
+          - ruby: 2.5
+            gemfile: rails70
+          - ruby: 2.6
+            gemfile: rails70
+          - ruby: 3.0
+            gemfile: rails50
+          - ruby: 3.0
+            gemfile: rails51
+          - ruby: 3.0
+            gemfile: rails52
+          - ruby: 3.1
+            gemfile: rails50
+          - ruby: 3.1
+            gemfile: rails51
+          - ruby: 3.1
+            gemfile: rails52
+
+    name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Prepare test
+      run: |
+        cd spec/dummy
+        BUNDLE_GEMFILE=../../${{ env.BUNDLE_GEMFILE }} RAILS_ENV=test bundle exec rake dbs:migrate
+        cd ../..
+    - name: Run test
+      run: |
+        bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 2.0.3
+
+* Fix database config detection for rails 7.0.
+
+## 2.0.2
+
+* Force establish_connection after fork.
+
+## 2.0.1
+
+* Force file reopen mode to `a+`.
+* Set empty array for default `queues` config.
+* Support to configure worker's option as false. (flavono123, #8)
+
 ## 2.0.0
 
 * Support multiple databases.

data/gemfiles/rails60.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem "delayed_job_active_record", "~> 4.1.0"
 gem "rails", "~> 6.0.0"
+gem "psych", "~> 3.3.0"
 
 gemspec path: "../"

data/gemfiles/rails61.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/rails70.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 7.0.1"
+
+gemspec path: "../"

data/lib/delayed/master/config.rb

@@ -21,7 +21,7 @@ module Delayed
       end
 
       def add_worker
-        worker = WorkerSetting.new(id: @workers.size, count: 1, exit_on_complete: true)
+        worker = WorkerSetting.new(id: @workers.size, queues: [], count: 1, exit_on_complete: true)
         yield worker
         @workers << worker
       end
@@ -36,7 +36,7 @@ module Delayed
 
       SIMPLE_CONFIGS.each do |key|
         define_method(key) do |value = nil|
-          if value
+          if !value.nil?
             @data[key] = value
           else
             @data[key]
@@ -72,7 +72,7 @@ module Delayed
 
         SIMPLE_CONFIGS.each do |key|
           define_method(key) do |value = nil|
-            if value
+            if !value.nil?
               @data[key] = value
             else
               @data[key]

data/lib/delayed/master/database_detector.rb

@@ -0,0 +1,37 @@
+module Delayed
+  class Master
+    class DatabaseDetector
+      def initialize
+      end
+
+      def call
+        load_spec_names.select { |spec_name| has_delayed_job_table?(spec_name) }
+      end
+
+      private
+
+      def load_spec_names
+        if Rails::VERSION::MAJOR >= 6
+          load_spec_names_from_multi_db_config
+        else
+          [Rails.env.to_sym]
+        end
+      end
+
+      def load_spec_names_from_multi_db_config
+        configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+        configs.reject!(&:replica?)
+        if Rails::VERSION::MAJOR == 6
+          configs.map { |c| c.spec_name.to_sym }
+        else
+          configs.map { |c| c.name.to_sym }
+        end
+      end
+
+      def has_delayed_job_table?(spec_name)
+        ActiveRecord::Base.establish_connection(spec_name)
+        ActiveRecord::Base.connection.tables.include?('delayed_jobs')
+      end
+    end
+  end
+end

data/lib/delayed/master/job_checker.rb

@@ -1,4 +1,5 @@
 require_relative 'job_counter'
+require_relative 'database_detector'
 
 module Delayed
   class Master
@@ -52,34 +53,18 @@ module Delayed
         prc = @config.after_fork
         @config.after_fork do |master, worker|
           prc.call(master, worker)
-          if worker.database && ActiveRecord::Base.connection_pool.spec.name != worker.database.to_s
-            ActiveRecord::Base.establish_connection(worker.database)
-          end
+          ActiveRecord::Base.establish_connection(worker.database) if worker.database
         end
       end
 
       def target_spec_names
         if @config.databases.nil? || @config.databases.empty?
-          load_spec_names.select { |spec_name| has_delayed_job_table?(spec_name) }
+          DatabaseDetector.new.call
         else
           @config.databases
         end
       end
 
-      def load_spec_names
-        if Rails::VERSION::MAJOR >= 6
-          configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
-          configs.reject(&:replica?).map { |c| c.spec_name.to_sym }
-        else
-          [Rails.env.to_sym]
-        end
-      end
-
-      def has_delayed_job_table?(spec_name)
-        ActiveRecord::Base.establish_connection(spec_name)
-        ActiveRecord::Base.connection.tables.include?('delayed_jobs')
-      end
-
       def find_jobs_in_db(spec_name)
         counter = JobCounter.new(model_for(spec_name))
 

data/lib/delayed/master/util/file_reopener.rb

@@ -6,7 +6,7 @@ module Delayed
           def reopen
             ObjectSpace.each_object(File) do |file|
               next if file.closed? || !file.sync
-              file.reopen file.path 
+              file.reopen file.path, 'a+'
               file.sync = true
               file.flush
             end

data/lib/delayed/master/version.rb

@@ -1,5 +1,5 @@
 module Delayed
   class Master
-    VERSION = "2.0.0"
+    VERSION = "2.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_master
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -129,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -143,9 +143,12 @@ files:
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/delayed/master.rb
 - lib/delayed/master/command.rb
 - lib/delayed/master/config.rb
+- lib/delayed/master/database_detector.rb
 - lib/delayed/master/forker.rb
 - lib/delayed/master/job_checker.rb
 - lib/delayed/master/job_counter.rb
@@ -181,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A simple delayed_job master process to control multiple workers

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-gemfile:
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
-  - gemfiles/rails52.gemfile
-  - gemfiles/rails60.gemfile
-matrix:
-  exclude:
-  - rvm: 2.3
-    gemfile: gemfiles/rails60.gemfile
-  - rvm: 2.4
-    gemfile: gemfiles/rails60.gemfile
-before_script:
-  - cd spec/dummy
-  - bundle exec rake dbs:migrate RAILS_ENV=test
-  - cd ../..
-script:
-  - bundle exec rspec