switchman 3.5.6 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d87b95f94fe959e18717de83ef0b39415dbf1479e57d4d3dde269aebde2f6e
-  data.tar.gz: 660a121e4d107cf2db3792eab635ee0847fdc7a950d0338281c4b63b77a5d4fc
+  metadata.gz: 88184c7066c4920ceb4b073e35742a8dd4c2b008d2e99ec58c83d17b602f94de
+  data.tar.gz: d9cc2ac7ea0f572d567c06a7afc5b21019ecb05a6bccbe111c606a19011af113
 SHA512:
-  metadata.gz: e09ee49ddff4718ca169890eff74e9d4bf4b8122e152762a6220b68093c185cbc7dc9c3bc82035a5f336fead51b98847f56ba2291da5ad2f98a355bc1cf04f90
-  data.tar.gz: 15772217715f825b21433adef3548e938ac891770809dc2eed5bf9384fa3e9b8259ccaed696841c5c442d195d73f7f465d0171834021d5d23fec747a0ca72fd4
+  metadata.gz: 523170b15e3509084fcc76fcf8809883e24d4ea40f5b16f09362023c536b847af3a52fd888bb97ed983b0781d07b5e4ca3ad86ee9ee8e1b13b112bbefa4fb3b8
+  data.tar.gz: b2e6328a42baf46c0b4bbc82a0a37cc0e4dcf45d0a51323b21f8cbff005e0d7daf2c90b5a213660bc1c8296022dfcdec284473f8a48aafe8d9393641fd990e4d

data/lib/switchman/database_server.rb

@@ -268,12 +268,18 @@ module Switchman
     end
 
     def primary_shard
-      unless instance_variable_defined?(:@primary_shard)
+      return nil unless primary_shard_id
+
+      Shard.lookup(primary_shard_id)
+    end
+
+    def primary_shard_id
+      unless instance_variable_defined?(:@primary_shard_id)
         # if sharding isn't fully set up yet, we may not be able to query the shards table
-        @primary_shard = Shard.default if Shard.default.database_server == self
-        @primary_shard ||= shards.where(name: nil).first
+        @primary_shard_id = Shard.default.id if Shard.default.database_server == self
+        @primary_shard_id ||= shards.where(name: nil).first&.id
       end
-      @primary_shard
+      @primary_shard_id
     end
   end
 end

data/lib/switchman/standard_error.rb

@@ -13,6 +13,8 @@ module Switchman
         Thread.current[:switchman_error_handler] = true
 
         @active_shards ||= Shard.active_shards
+      rescue ThreadError # e.g. `require': can't be called from trap context (ThreadError)
+        # intentionally empty
       ensure
         Thread.current[:switchman_error_handler] = nil
       end

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = "3.5.6"
+  VERSION = "3.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.5.6
+  version: 3.5.8
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord