ebisu_connection 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d18980741ce133172b0fb8ab9bbaa1e171a1190
-  data.tar.gz: 4e44601e1a9137721c63b69be36604155b8b7e0e
+  metadata.gz: acec29bfafab4c90b03cf8594363584b07918948
+  data.tar.gz: c4659e218081594a681fbf92e8443018560239b1
 SHA512:
-  metadata.gz: 61ce15decbf4956cb90a81ac924bc62e89758bf2c290f1a73c0684350d7cd90192d3086ea268e1a0ca8951a73b64eff15e36d0c10b72002682089c507880b1e3
-  data.tar.gz: 88d8e8e397020242d01dd69c7d386e1a0f09a1a6295f51cf2d3dbb48faeae9f64fc2af19a5d693f64421724e5956f8e0e07d1c7467502156ac83b369a877e541
+  metadata.gz: 5226bfef7a1027d4ff43dd59d61d9b53dc569cc96e4d12b96cd49bf857adb5111600a73cee38e94d4bbceca1e8e7e71722a8a6c97de5771b7a304da6091c8929
+  data.tar.gz: e1a8426b0365a3132464b062e541d0835e887025b74a3a82536301011113dfa74916d2b2d8f4f0969b95031ffb1050c05163f65a89731a0fe0499b8d2c37be0e

data/ebisu_connection.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'activerecord', '>= 3.2.0'
-  spec.add_dependency 'fresh_connection', '>= 0.1.6'
+  spec.add_dependency 'fresh_connection', '>= 0.1.7'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/ebisu_connection/connection_manager.rb

@@ -1,7 +1,8 @@
 require 'yaml'
+require 'fresh_connection/abstract_connection_manager'
 
 module EbisuConnection
-  class ConnectionManager
+  class ConnectionManager < FreshConnection::AbstractConnectionManager
     class << self
       delegate :slave_file, :slave_file=, :check_interval, :check_interval=,
         :slave_type, :slave_type=, :to => EbisuConnection::ConfFile
@@ -13,7 +14,7 @@ module EbisuConnection
       :to => EbisuConnection::ConfFile
 
     def initialize
-      @mutex = Mutex.new
+      super
       @slaves = {}
     end
 
@@ -30,8 +31,21 @@ module EbisuConnection
       end
     end
 
+    def recovery(failure_connection, exception)
+      if recoverable? && slave_down_message?(exception.message)
+        slaves.remove_connection(failure_connection)
+        true
+      else
+        false
+      end
+    end
+
+    def recoverable?
+      true
+    end
+
     def clear_all_connection!
-      @mutex.synchronize do
+      synchronize do
         @slaves.values.each do |s|
           s.all_disconnect!
         end
@@ -44,7 +58,7 @@ module EbisuConnection
     private
 
     def check_own_connection
-      @mutex.synchronize do
+      synchronize do
         s = @slaves[current_thread_id]
 
         if s && s.reserved_release?
@@ -58,7 +72,7 @@ module EbisuConnection
     end
 
     def reserve_release_all_connection
-      @mutex.synchronize do
+      synchronize do
         @slaves.values.each do |s|
           s.reserve_release_connection!
         end
@@ -67,7 +81,7 @@ module EbisuConnection
     end
 
     def slaves
-      @mutex.synchronize do
+      synchronize do
         @slaves[current_thread_id] ||= get_slaves
       end
     end
@@ -75,9 +89,5 @@ module EbisuConnection
     def get_slaves
       EbisuConnection::Slaves.new(slaves_conf, spec)
     end
-
-    def current_thread_id
-      Thread.current.object_id
-    end
   end
 end

data/lib/ebisu_connection/slaves.rb

@@ -1,5 +1,7 @@
 module EbisuConnection
   class Slaves
+    class AllSlavesHasGoneError < StandardError; end
+
     class Slave
       attr_reader :hostname, :weight
 
@@ -45,25 +47,27 @@ module EbisuConnection
     end
 
     def initialize(slaves_conf, spec)
-      weight_list = []
       @slaves = slaves_conf.map do |conf|
-        s = Slave.new(conf, spec)
-        weight_list << s.weight
-        s
+        Slave.new(conf, spec)
       end
 
-      @roulette = []
-      gcd = get_gcd(weight_list)
-      weight_list.each_with_index do |w, index|
-        weight = w / gcd
-        @roulette.concat([index] * weight)
-      end
+      recalc_roulette
     end
 
     def sample
+      raise AllSlavesHasGoneError if @slaves.blang?
       @slaves[@roulette.sample]
     end
 
+    def remove_connection(connection)
+      return unless s = @slaves.detect{|s| s.connection == connection}
+      s.disconnect! rescue nil
+      @slaves.delete(s)
+      raise AllSlavesHasGoneError if @slaves.blank?
+      recalc_roulette
+      nil
+    end
+
     def all_disconnect!
       @reserve_release = nil
       @slaves.each {|s| s.disconnect!}
@@ -79,6 +83,17 @@ module EbisuConnection
 
     private
 
+    def recalc_roulette
+      weight_list = @slaves.map {|s| s.weight }
+
+      @roulette = []
+      gcd = get_gcd(weight_list)
+      weight_list.each_with_index do |w, index|
+        weight = w / gcd
+        @roulette.concat([index] * weight)
+      end
+    end
+
     def get_gcd(list)
       list = list.sort.uniq
       n = list.shift

data/lib/ebisu_connection/version.rb

@@ -1,3 +1,3 @@
 module EbisuConnection
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebisu_connection
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - tsukasaoishi
 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
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement