active_replicas 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca9a6167f644072559d4c08949399d194836f374
-  data.tar.gz: 7b3d50bba4fa8c7c88ce17700370f598322f66e9
+  metadata.gz: '09a494a1422b4168371ae516d05e6afa1c4f9814'
+  data.tar.gz: 3d485d0a6de319a336997fb69738ce62437acff1
 SHA512:
-  metadata.gz: d45ad8b9d6a94e932ddc397c9985553180e922bbc93032aea69be3d44253a6083d71625160ef693bb5cf6239784d33b8a43b147e0ac86d2da252cefbe02463cc
-  data.tar.gz: 443ca893adf2d5863cbc777081427743edaf565cb7da446af307eee8669bf2916adbef6bb4182606f8cb68c3bc0f5b0d80562391eefa34205290a32a235b5a20
+  metadata.gz: 8ef2a51477d2babfeeecf039f002b93c61834eb8474cb00357da1c83b16ce248373f9caabe92302991ca51ea6d874cc0c390e53f63d40740e51619bb250bd23e
+  data.tar.gz: 25a10e0378a152b69e11c2d91e6cbd66a247ff364bc8dae8c69d44a64045be77fa97a5c0f0e99dfee1ab4fc6e08b5b3094363d55b0393bbfc2ac313b8b188703

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    active_replicas (0.2.7)
+    active_replicas (0.2.8)
       concurrent-ruby (~> 1.0)
 
 GEM

data/lib/active_replicas/proxying_connection_pool.rb

@@ -1,3 +1,4 @@
+require 'monitor'
 require 'active_support/hash_with_indifferent_access'
 
 module ActiveReplicas
@@ -23,6 +24,8 @@ module ActiveReplicas
       # Thread-safe map of the connections from each pool. Cleared in tandem
       # with the connection pools.
       @connections = Concurrent::Map.new
+
+      extend MonitorMixin
     end
 
     # Returns an instance of `ActiveRecord::ConnectionAdapters::ConnectionPool`
@@ -43,22 +46,26 @@ module ActiveReplicas
     def connection
       pool = current_pool
 
-      @connections[pool] ||= begin
-        conn = pool.connection
-        return unless conn
+      @connections[pool] || synchronize do
+        @connections[pool] ||= begin
+          conn = pool.connection
+          return unless conn
 
-        ProxyingConnection.new connection: conn,
-                               is_primary: pool == @primary_pool,
-                               proxy:      self
+          ProxyingConnection.new connection: conn,
+                                 is_primary: pool == @primary_pool,
+                                 proxy:      self
+        end
       end
     end
 
     def release_connection
-      each_pool &:release_connection
+      synchronize do
+        each_pool &:release_connection
 
-      @primary_depth = 0
-      @current_pool = nil
-      @connections.clear
+        @primary_depth = 0
+        @current_pool = nil
+        @connections.clear
+      end
     end
 
     def with_connection(&block)
@@ -66,11 +73,15 @@ module ActiveReplicas
     end
 
     def connected?
-      current_pool.connected?
+      synchronize do
+        current_pool.connected?
+      end
     end
 
     def disconnect!
-      each_pool &:disconnect!
+      synchronize do
+        each_pool &:disconnect!
+      end
     end
 
     def current_pool

data/lib/active_replicas/version.rb

@@ -1,3 +1,3 @@
 module ActiveReplicas
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_replicas
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Dirk Gadsden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby