delayed_job_master 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3183f5a73de37ebe6c4303cab37285c8378b8b7f06fc809abf40404efbfea66
-  data.tar.gz: 43a33ec26663e0bd1fe632663cec398b79c53859dd9f17c29e5ca77b881c0ca2
+  metadata.gz: af19b8a7d431072868701600d2298be3df8dbcd67b77b9475ce8ac92299c9a00
+  data.tar.gz: 124d605397464a453c2bf96774c7453cdefd8746696eda34c027f0f8312522cb
 SHA512:
-  metadata.gz: 2cdeb80a4394fa04cb51289413b5f16f80006ecd958fcd24919cda177e01883e09f1d13876c0218f5cc1e645bd514a5a93f1e1b412a056e3f08b0dcf8fb1eb3c
-  data.tar.gz: 2dc3d4c9370b77648fd7e7b26388cdae0ec5798eb043f88df3b9b04d0b966de79a9f2e48a72068a93bd79e83cae2e27e324a1d4e41eff364d8fbdc41e6dd0321
+  metadata.gz: f7f4033ac2a0289d098e38c001ffb8fcafbcecda60b757dd1622922f5779850bbf0887ffd45ce135d343ebc3f607c0249517ed8ad7230bbdbe0d55f766ec4942
+  data.tar.gz: 39f656a25a4a1d843749b727e09eace912f55b74fb5bd51d289abc3cc8679de837a95b330b455583a37c0d8b410a94372ce50e53edf3732cd3e0bf707d305de8

data/.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-16.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0]
+        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61']
+        exclude:
+          - ruby: 2.3
+            gemfile: rails60
+          - ruby: 2.3
+            gemfile: rails61
+          - ruby: 2.4
+            gemfile: rails60
+          - ruby: 2.4
+            gemfile: rails61
+          - ruby: 3.0
+            gemfile: rails50
+          - ruby: 3.0
+            gemfile: rails51
+          - ruby: 3.0
+            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,9 @@
 # CHANGELOG
 
+## 2.0.2
+
+* Force establish_connection after fork.
+
 ## 2.0.1
 
 * Force file reopen mode to `a+`.

data/gemfiles/rails61.gemfile

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

data/lib/delayed/master/job_checker.rb

@@ -52,9 +52,7 @@ 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
 

data/lib/delayed/master/version.rb

@@ -1,5 +1,5 @@
 module Delayed
   class Master
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_master
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2021-01-23 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,6 +143,7 @@ files:
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/delayed/master.rb
 - lib/delayed/master/command.rb
 - lib/delayed/master/config.rb
@@ -181,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: A simple delayed_job master process to control multiple workers

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-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