fresh_connection 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8989dd7a0aed3ff918db29ccf6efad0df8bdef02
-  data.tar.gz: df4cc23bdd361747bf850ed5b56551bd27eae6ac
+  metadata.gz: a6cf45789101eb5867723358916e51d9830479c7
+  data.tar.gz: 829c2c642c9357cbd4e40966601d4e9fa05ccedb
 SHA512:
-  metadata.gz: 78177496e1e8407aac405f6b3c9997bfb0a5abedda4648ea5d83002cca0931df2ef3e76b92532a1ec0d9bc9701611f87cc24d8ca40fa7804db40776fba75d6d4
-  data.tar.gz: 1547a303c0fb1eea943a9b8fbc5cfef4d6bc709462d4512a792e3a736d2317472ea1ab798f0c4a35d944f5ae5d3ab60e08f5e2a403a59b387acadc5bc35643fd
+  metadata.gz: 43f069ab92bc1383f3bd3c48503e3fd4df75cbda1622b6a2c81d11241787e78aeced42c7a492160090029a5212e1b61184989546bb3f5d8d4fa7a46dd35d5f0a
+  data.tar.gz: f06dacf9d04f362810a0febd8421cd78fbf94fc2ece3fddecd6cffb2845359394c51dca0a6fc4b1ddcd5b3d9654dc9c1e3f675edd16bcc58cd0ad0c2df5bcdbd

data/lib/fresh_connection/abstract_connection_manager.rb

@@ -0,0 +1,42 @@
+module FreshConnection
+  class AbstractConnectionManager
+    EXCEPTION_MESSAGE_WHEN_SLAVE_SERVER_DOWN = [
+      "MySQL server has gone away",
+      "closed MySQL connection",
+      "Can't connect to local MySQL server"
+    ].map{|msg| Regexp.escape(msg)}.join("|")
+
+    def initialize
+      @mutex = Mutex.new
+    end
+
+    def slave_connection
+    end
+
+    def put_aside!
+    end
+
+    def recovery(failure_connection, exception)
+      false
+    end
+
+    def recoverable?
+      false
+    end
+
+    private
+
+    def synchronize
+      @mutex.synchronize{ yield }
+    end
+
+    def current_thread_id
+      Thread.current.object_id
+    end
+
+    def slave_down_message?(message)
+      /#{EXCEPTION_MESSAGE_WHEN_SLAVE_SERVER_DOWN}/o =~ message
+    end
+  end
+end
+

data/lib/fresh_connection/active_record/abstract_adapter.rb

@@ -13,9 +13,20 @@ module ActiveRecord
       private
 
       def change_connection
-        master_connection, @connection =
-          @connection, FreshConnection::SlaveConnection.raw_connection
-        yield
+        retry_count = 0
+        master_connection = @connection
+        begin
+          slave_connection = FreshConnection::SlaveConnection.slave_connection
+          @connection = slave_connection.raw_connection
+          yield
+        rescue ActiveRecord::StatementInvalid => exception
+          if FreshConnection::SlaveConnection.recovery(slave_connection, exception)
+            retry_count += 1
+            retry if retry_count < FreshConnection::SlaveConnection.retry_limit
+          end
+
+          raise
+        end
       ensure
         @connection = master_connection
       end

data/lib/fresh_connection/connection_manager.rb

@@ -1,27 +1,40 @@
-module FreshConnection
-  class ConnectionManager
-    def initialize
-      @mutex = Mutex.new
-    end
+require 'fresh_connection/abstract_connection_manager'
 
+module FreshConnection
+  class ConnectionManager < AbstractConnectionManager
     def slave_connection
-      @mutex.synchronize do
-        @slave_connections ||= {}
-        @slave_connections[current_thread_id] ||= new_connection
+      synchronize do
+        slave_connections[current_thread_id] ||= new_connection
       end
     end
 
     def put_aside!
-      @mutex.synchronize do
-        @slave_connections ||= {}
-        if c = @slave_connections.delete(current_thread_id)
+      synchronize do
+        if c = slave_connections.delete(current_thread_id)
           c.disconnect! rescue nil
         end
       end
     end
 
+    def recovery(failure_connection, exception)
+      if recoverable? && slave_down_message?(exception.message)
+        put_aside!
+        true
+      else
+        false
+      end
+    end
+
+    def recoverable?
+      true
+    end
+
     private
 
+    def slave_connections
+      @slave_connections ||= {}
+    end
+
     def new_connection
       ActiveRecord::Base.send("#{spec["adapter"]}_connection", spec)
     end
@@ -34,9 +47,5 @@ module FreshConnection
       ret = ActiveRecord::Base.configurations[Rails.env]
       ret.merge(ret["slave"] || {})
     end
-
-    def current_thread_id
-      Thread.current.object_id
-    end
   end
 end

data/lib/fresh_connection/slave_connection.rb

@@ -2,21 +2,12 @@ module FreshConnection
   class SlaveConnection
     COUNT = :fresh_connection_access_count
     TARGET = :fresh_connection_access_target
+    RETRY_LIMIT = 10
 
     class << self
       attr_writer :ignore_models, :ignore_configure_connection
 
-      def raw_connection
-        slave_connection.raw_connection
-      end
-
-      def slave_connection
-        connection_manager.slave_connection
-      end
-
-      def put_aside!
-        connection_manager.put_aside!
-      end
+      delegate :slave_connection, :put_aside!, :recoverable?, :recovery, :to => :connection_manager
 
       def manage_access(model_klass, go_slave, &block)
         if ignore_model?(model_klass)
@@ -57,6 +48,10 @@ module FreshConnection
         @connection_manager_class = manager
       end
 
+      def retry_limit
+        RETRY_LIMIT
+      end
+
       private
 
       def force_master_access

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -65,6 +65,7 @@ files:
 - Rakefile
 - fresh_connection.gemspec
 - lib/fresh_connection.rb
+- lib/fresh_connection/abstract_connection_manager.rb
 - lib/fresh_connection/active_record/abstract_adapter.rb
 - lib/fresh_connection/active_record/mysql2_adapter.rb
 - lib/fresh_connection/active_record/relation.rb