switchman 3.0.11 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49ec10390b095e34032d625e9a1540217c8d4361b7d0961d0f10218d2349ef6a
-  data.tar.gz: 29f9748cbf4f1d4d268171ae7c0863d296b23788c8ee0153ee9cb32938933c03
+  metadata.gz: a1e19102ef71895fd381f6da856f98b71a44102fbbc08b9738f510c18fe198ed
+  data.tar.gz: acf67d407d42a2d32c617696f66000d358f4fbfbc7b12077e32945c07553853f
 SHA512:
-  metadata.gz: c0c79ce80057b54bb0a7234d9ff09b7b9aa6af18c25b1b0c1b32365244ecb22332c90b2d477d537c24869ec84f9a1af06059e77e9f53a21c2391164df7758338
-  data.tar.gz: 7e335d49f3e8e44eb1d2ea1061dd837ceffb5a7505c7d2dbefe11c5bea2ba290bf0795b0f74a938bedd2e79f69dda03bd2da62ffabe8f6f8771da5053007a073
+  metadata.gz: 9fad637185836ac6f213b6bd61870fd3390a0f10f66d74fcb0c913977e6c5d394cfee57ceab430800dc0b96a43508f131864b1aad4fb037bea861166fed30dd5
+  data.tar.gz: 6f3592f8ed5a920a9e556fd0a888ac59ce17ca144f85a3d78077f6a3ab036ec385f7e7070b08fd0db9de93fd54f408315837fc97e118229259e43147b017aae7

data/lib/switchman/standard_error.rb

@@ -3,20 +3,22 @@
 module Switchman
   module StandardError
     def initialize(*args)
-      # Shard.current can throw this when switchman isn't working right; if we try to
-      # do our stuff here, it'll cause a SystemStackError, which is a pain to deal with
-      if is_a?(::ActiveRecord::ConnectionNotEstablished)
-        super
-        return
-      end
+      super
+      # These seem to get themselves into a bad state if we try to lookup shards while processing
+      return if is_a?(IO::EAGAINWaitReadable)
+      return if Thread.current[:switchman_error_handler]
 
       begin
-        @active_shards = Shard.active_shards if defined?(Shard)
-      rescue ::ActiveRecord::ConnectionNotEstablished
-        # If we hit an error really early in boot, activerecord may not be initialized yet
-      end
+        Thread.current[:switchman_error_handler] = true
 
-      super
+        begin
+          @active_shards = Shard.active_shards if defined?(Shard)
+        rescue
+          # If we hit an error really early in boot, activerecord may not be initialized yet
+        end
+      ensure
+        Thread.current[:switchman_error_handler] = nil
+      end
     end
 
     def current_shard(klass = ::ActiveRecord::Base)

data/lib/switchman/version.rb

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

metadata

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