ebisu_connection 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b135ecfde83d564cc7dcfbfaa7632f057fdf2fe1
-  data.tar.gz: 39f3cdb331514ae4ea8d24d9e463f7287bd60dd9
+  metadata.gz: f7397a17d9b203b5278468bc1f0bbea7a315d133
+  data.tar.gz: 4d5904d664ec3ec2f05e4e2d6f327b0e59f683cf
 SHA512:
-  metadata.gz: c59b5f27c126da53ff6a29e8f7604d69be14c0f0d55347ea01d20d0efad05a428765f21dfdfc160265167b26e7ad28135f118c875ae226bd9453c2cd721b0d1d
-  data.tar.gz: f6ffaf1813892a30f3750d0a796170b36a0fc8e162644d436dcbc8e3640abd532dadf39786de1bec1206884e5190a08fd4c7317ece15643683110cfec28a447c
+  metadata.gz: 3940807ea924e4720501d3070c1a9cd51846a1f871c4923d8206770ca0435e092b2ddf3969e5210ca8c5fdb30250b215475d8c88e307950ffbff88c280b09785
+  data.tar.gz: 945d266756d44550d10bb26884d5a37978d022980757b6f9e07255c0de27a162a8d26c2674e238a5f5238bb434e6da8fa08d6a061b86f82f2afe1b10b0a96b27

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.2'
+  spec.add_dependency 'fresh_connection', '>= 0.1.6'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/ebisu_connection/connection_manager.rb

@@ -22,6 +22,7 @@ module EbisuConnection
     end
 
     def put_aside!
+      return if check_own_connection
       return unless @file_mtime
 
       now = Time.now
@@ -32,11 +33,13 @@ module EbisuConnection
       mtime = File.mtime(self.class.slaves_file)
       return if @file_mtime == mtime
 
-      clear_all_connection!
+      reserve_release_all_connection
+      check_own_connection
     end
 
     def clear_all_connection!
       @mutex.synchronize do
+        @slaves ||= {}
         @slaves.values.each do |s|
           s.all_disconnect!
         end
@@ -49,6 +52,31 @@ module EbisuConnection
 
     private
 
+    def check_own_connection
+      ret = false
+      @mutex.synchronize do
+        @slaves ||= {}
+        if s = @slaves[current_thread_id]
+          if ret = s.reserved_release?
+            s.all_disconnect!
+            @slaves.delete(current_thread_id)
+          end
+        end
+      end
+      ret
+    end
+
+    def reserve_release_all_connection
+      @mutex.synchronize do
+        @slaves ||= {}
+        @slaves.values.each do |s|
+          s.reserve_release_connection!
+        end
+        @slave_conf = nil
+        @spec = nil
+      end
+    end
+
     def slaves
       @mutex.synchronize do
         @slaves ||= {}

data/lib/ebisu_connection/slaves.rb

@@ -65,9 +65,18 @@ module EbisuConnection
     end
 
     def all_disconnect!
+      @reserve_release = nil
       @slaves.each {|s| s.disconnect!}
     end
 
+    def reserve_release_connection!
+      @reserve_release = true
+    end
+
+    def reserved_release?
+      !!@reserve_release
+    end
+
     private
 
     def get_gcd(list)

data/lib/ebisu_connection/version.rb

@@ -1,3 +1,3 @@
 module EbisuConnection
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebisu_connection
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - tsukasaoishi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-13 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.2
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement