semian 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2297213cb021d0958a8826c46536af57862e7582
-  data.tar.gz: cd2683b720caa4b4e5dfe2e8db5a774b822f13ca
+  metadata.gz: 4b365b861b701b9fa52df84a771d48cfce3fbfc8
+  data.tar.gz: 18fe305ce3d4132fde7d3c358255097e7e6fa5bc
 SHA512:
-  metadata.gz: cb26790fd5481ada268ae712f500ccbf52df6b39bb05634d913811c8fe55d75d1e5cd2523157386dca701b154dfacc6f48a233215bccef3485ffed52ab8c9974
-  data.tar.gz: 1d193bb017105f5d4c5aaa7f4872034997f564d9bd8a863fccc285f7b9e94fe6465a917101161e43dfee0383dccc1157d83fc0054479526ecb8a288bcab55e60
+  metadata.gz: 3f2acf17c3d39ebbc595b58c099ba0711f4bcc356f4c9fdc00d7e401e26959cf547d5fe2395aa3324dbf632abecb6802885a69e76d08ce8ced17bf139868b310
+  data.tar.gz: fb0343a60116861285186ec5009db34e8a4296c7b08f4d16e94c96628ef11829d3425b1f37b9c60d3fd3a6aa3e40b8c71ca4784bf96f1713cf01a7c8ecf901c6

data/lib/semian/mysql2.rb

@@ -21,12 +21,13 @@ module Semian
 
     CONNECTION_ERROR = Regexp.union(
       /Can't connect to MySQL server on/i,
-      /Lost connection to MySQL server during query/i,
+      /Lost connection to MySQL server/i,
       /MySQL server has gone away/i,
     )
 
     ResourceBusyError = ::Mysql2::ResourceBusyError
     CircuitOpenError = ::Mysql2::CircuitOpenError
+    PingFailure = Class.new(::Mysql2::Error)
 
     DEFAULT_HOST = 'localhost'
     DEFAULT_PORT = 3306
@@ -44,6 +45,9 @@ module Semian
 
       base.send(:alias_method, :raw_connect, :connect)
       base.send(:remove_method, :connect)
+
+      base.send(:alias_method, :raw_ping, :ping)
+      base.send(:remove_method, :ping)
     end
 
     def semian_identifier
@@ -57,6 +61,17 @@ module Semian
       end
     end
 
+    def ping
+      result = nil
+      acquire_semian_resource(adapter: :mysql, scope: :ping) do
+        result = raw_ping
+        raise PingFailure.new(result.to_s) unless result
+      end
+      result
+    rescue ResourceBusyError, CircuitOpenError, PingFailure
+      false
+    end
+
     def query(*args)
       if query_whitelisted?(*args)
         raw_query(*args)
@@ -84,7 +99,7 @@ module Semian
     def acquire_semian_resource(*)
       super
     rescue ::Mysql2::Error => error
-      if error.message =~ CONNECTION_ERROR
+      if error.message =~ CONNECTION_ERROR || error.is_a?(PingFailure)
         semian_resource.mark_failed(error)
         error.semian_identifier = semian_identifier
       end

data/lib/semian/version.rb

@@ -1,3 +1,3 @@
 module Semian
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/test/mysql2_test.rb

@@ -255,11 +255,32 @@ class TestMysql2 < Minitest::Test
     assert_equal 2, client.query('SELECT 1 + 1 as sum;').to_a.first['sum']
   end
 
+  def test_pings_are_circuit_broken
+    client = connect_to_mysql!
+
+    def client.raw_ping
+      @real_pings ||= 0
+      @real_pings += 1
+      super
+    end
+
+    @proxy.downstream(:latency, latency: 1200).apply do
+      ERROR_THRESHOLD.times do
+        client.ping
+      end
+
+      assert_equal false, client.ping
+    end
+
+    assert_equal ERROR_THRESHOLD, client.instance_variable_get(:@real_pings)
+  end
+
   private
 
   def connect_to_mysql!(semian_options = {})
     Mysql2::Client.new(
       connect_timeout: 1,
+      read_timeout: 1,
       host: '127.0.0.1',
       port: '13306',
       semian: SEMIAN_OPTIONS.merge(semian_options),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Scott Francis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler