switchman 3.0.18 → 3.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21bdb8885af6932038bdf482531843f9d0157e0c51d806601937248e636ff98a
-  data.tar.gz: 92f0ae609d94b8d7eeefa909927481964a09305a00ebcc792d8b8079625df226
+  metadata.gz: df4352d56024adc191b904c1786c43dff9a685be0c7e82e5813339a107ac6df3
+  data.tar.gz: 7f6ce97fdadcf3dff63b64065e94b2c4de5a481b234ec6f36429ff7eb796eccc
 SHA512:
-  metadata.gz: 5d399c2f5de126812026515e4e5afd80380995cd8f098a561a3b17467c68caee64367ac60aa34c46c9a0f4550f9b246a459fd107d364e905db0098b665f32e9c
-  data.tar.gz: '096f236515a0641c11805fc71f43e866301cedfced33d4662222f9a9df08e8dbdecf97dd315273c80d21252ebd75ddb447628d1b6dccff4c94d5f3f782d5d7af'
+  metadata.gz: 26b862b5b2d44c3aebf24d2ce469e332ff3af117b75e05559d1343b399a01d36db1a321f6fb2f48e535d3e0f99517c56c0dd549911d47b9ef024e8652b5f54b3
+  data.tar.gz: 229c8277f8df802f2f5f29221d66afbaba873ff70b0f97ca0ff9356a99b58d8b1dc08bd6fb07c75800275dfc4ef63ec8296451bdfed1204860fbfc1cd764d291

data/app/models/switchman/shard.rb

@@ -374,12 +374,12 @@ module Switchman
         shard || source_shard || Shard.current
       end
 
-      private
-
       def sharding_initialized
         @sharding_initialized ||= false
       end
 
+      private
+
       def add_sharded_model(klass)
         @sharded_models = (sharded_models + [klass]).freeze
         initialize_sharding
@@ -407,9 +407,13 @@ module Switchman
 
           klass.connects_to shards: connects_to_hash
         end
-        DatabaseServer.all.each { |db| db.guard! if db.config[:prefer_secondary] } unless @sharding_initialized
 
+        return if @sharding_initialized
+
+        # If we hadn't initialized sharding yet, the servers won't be guarded
+        # The order matters here or guard_servers will be a noop
         @sharding_initialized = true
+        DatabaseServer.guard_servers
       end
 
       # in-process caching

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
@@ -64,6 +66,14 @@ module Switchman
           current_role != current_role(without_overrides: true)
         end
 
+        def connected_to_stack
+          return super if Thread.current.thread_variable?(:ar_connected_to_stack)
+
+          ret = super
+          DatabaseServer.guard_servers
+          ret
+        end
+
         # significant change: Allow per-shard roles
         def current_role(without_overrides: false)
           return super() if without_overrides

data/lib/switchman/active_record/database_configurations.rb

@@ -27,7 +27,9 @@ module Switchman
         return configs if configs.is_a?(Array)
 
         db_configs = configs.flat_map do |env_name, config|
-          roles = config.keys.select { |k| config[k].is_a?(Hash) }
+          # It would be nice to do the auto-fallback that we want here, but we haven't
+          # actually done that for years (or maybe ever) and it will be a big lift to get working
+          roles = config.keys.select { |k| config[k].is_a?(Hash) || (config[k].is_a?(Array) && config[k].all? { |ck| ck.is_a?(Hash) }) }
           base_config = config.except(*roles)
 
           name = "#{env_name}/primary"
@@ -35,7 +37,7 @@ module Switchman
           base_db = build_db_config_from_raw_config(env_name, name, base_config)
           [base_db] + roles.map do |role|
             build_db_config_from_raw_config(env_name, "#{env_name}/#{role}",
-                                            base_config.merge(config[role]))
+                                            base_config.merge(config[role].is_a?(Array) ? config[role].first : config[role]))
           end
         end
 

data/lib/switchman/database_server.rb

@@ -49,6 +49,10 @@ module Switchman
         servers[rand(servers.length)]
       end
 
+      def guard_servers
+        all.each { |db| db.guard! if db.config[:prefer_secondary] }
+      end
+
       private
 
       def reference_role(role)
@@ -71,7 +75,7 @@ module Switchman
             if role == 'primary'
               @database_servers[name] = DatabaseServer.new(config.env_name, config.configuration_hash)
             else
-              @database_servers[name].roles << role
+              @database_servers[name].roles << role.to_sym
             end
           end
         end
@@ -133,6 +137,7 @@ module Switchman
     # when doing writes (then it falls back to the current
     # value of GuardRail.environment)
     def guard!(environment = :secondary)
+      DatabaseServer.send(:reference_role, environment)
       ::ActiveRecord::Base.connected_to_stack << { shard_roles: { id.to_sym => environment }, klasses: [::ActiveRecord::Base] }
     end
 

data/lib/switchman/version.rb

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

metadata

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