switchman 3.0.20 → 3.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e131a4d625dcfe3ff7854591e717574e3fddf49e29cb9a5aa2e1cc9df8c2f10
-  data.tar.gz: 385c067530063b6d4bcdc3f7f0463a57a54082c14be4e00ddf1f520ea5fabb26
+  metadata.gz: df4352d56024adc191b904c1786c43dff9a685be0c7e82e5813339a107ac6df3
+  data.tar.gz: 7f6ce97fdadcf3dff63b64065e94b2c4de5a481b234ec6f36429ff7eb796eccc
 SHA512:
-  metadata.gz: e6c9d4e232befbbf02b1da406d9bae6fd67731b0942ea3c46d29b87b40f2e457e0f0a03edc14547dd3269d619d0f019beab415150229e8d4a2f395cb3a4e51ea
-  data.tar.gz: f6e536576fa2b1f33c2f641ba0dbf0fdb3e487706558efb2bb924af63b8bc939ed45ee491676d5887313d428e64d42cfc13604fc291e561127cd829ced728471
+  metadata.gz: 26b862b5b2d44c3aebf24d2ce469e332ff3af117b75e05559d1343b399a01d36db1a321f6fb2f48e535d3e0f99517c56c0dd549911d47b9ef024e8652b5f54b3
+  data.tar.gz: 229c8277f8df802f2f5f29221d66afbaba873ff70b0f97ca0ff9356a99b58d8b1dc08bd6fb07c75800275dfc4ef63ec8296451bdfed1204860fbfc1cd764d291

data/lib/switchman/active_record/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'switchman/database_server'
+
 module Switchman
   module ActiveRecord
     module Base
@@ -65,12 +67,9 @@ module Switchman
         end
 
         def connected_to_stack
-          ret = super
-          # Really early in boot, DatabaseServer may not be loaded yet,
-          # which is fine since we will guard when we initialize sharding in that case
-          return ret unless const_defined?(:DatabaseServer)
-          return ret if Thread.current.thread_variable?(:ar_connected_to_stack)
+          return super if Thread.current.thread_variable?(:ar_connected_to_stack)
 
+          ret = super
           DatabaseServer.guard_servers
           ret
         end

data/lib/switchman/database_server.rb

@@ -50,7 +50,7 @@ module Switchman
       end
 
       def guard_servers
-        all.each { |db| db.guard! if db.config[:prefer_secondary] } if Shard.sharding_initialized
+        all.each { |db| db.guard! if db.config[:prefer_secondary] }
       end
 
       private

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = '3.0.20'
+  VERSION = '3.0.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.0.20
+  version: 3.0.21
 platform: ruby
 authors:
 - Cody Cutrer