switchman 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c73ebcdb49c218c7550f44ec2087c7feb091ef45
-  data.tar.gz: e3e8e34ff693c05204617ba9e2c747db0a5fbc39
+  metadata.gz: 7e276855b3c8456e699ac6b6c98acb63f7073651
+  data.tar.gz: 5bde98e540b07948028776ae6565e112847b6086
 SHA512:
-  metadata.gz: 86b7f9cc5f2453465a963bf13c9252556e12750f91ee2a9474eea826a13bde2f7c04c271ad91d2fc3f97b0046deb5ce38c285914f62d3fa4bf9e94d617889076
-  data.tar.gz: e365daa2f0fe7ba8de97d29a44d832200b7256dca79378bca1d341ea1696c32320ae06390c486bd25030081e8fe966f76115518a33a031a8c721c33b3d420d1d
+  metadata.gz: e83f34a2731eab5383632da988c0f0b72ee0b13c56db38d3ae94b3e93af3117ffc6b95a9886c11f5878b726520f19a7c2f1e074d0e4dd436b4a7e253866e8886
+  data.tar.gz: cb6cb6bb2ac31c99777c892e3af926be2c1c8480da0a9ccbb6e1b3fd05bc000deb7b7bdcef8b04b8a1bd641f89c8c690de3c932daadaaaab0c5e3e9b528c796c

data/lib/switchman/active_record/connection_pool.rb

@@ -39,21 +39,26 @@ module Switchman
       def release_connection_with_idle_timeout(with_id = current_connection_id)
         release_connection_without_idle_timeout(with_id)
 
-        # TODO may need a synchronize (or to be included in a synchronize
-        # inside release_connection_without_idle_timeout) when we make
-        # switchman thread-safe
         if spec.config[:idle_timeout]
           clear_idle_connections!(Time.now - spec.config[:idle_timeout].to_i)
         end
       end
 
       def clear_idle_connections!(since_when)
-        @connections.reject! do |conn|
-          if conn.last_query_at < since_when && !conn.in_use?
-            conn.disconnect!
-            true
-          else
-            false
+        synchronize do
+          @connections.reject! do |conn|
+            if conn.last_query_at < since_when && !conn.in_use?
+              conn.disconnect!
+              true
+            else
+              false
+            end
+          end
+          if ::Rails.version >= '4'
+            @available.clear
+            @connections.each do |conn|
+              @available.add conn
+            end
           end
         end
       end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.3.9"
+  VERSION = "1.3.10"
 end

data/spec/dummy/log/test.log

@@ -356813,3 +356813,27 @@ Connecting to database specified by database.yml
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
    (0.1ms)  ROLLBACK
+   (2.7ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (25.9ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' ORDER BY "switchman_shards"."id" ASC LIMIT 1
+   (0.1ms)  BEGIN
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.9ms)  INSERT INTO "switchman_shards" ("database_server_id") VALUES ($1) RETURNING "id"  [["database_server_id", "1"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (1.3ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.6ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' ORDER BY "switchman_shards"."id" ASC LIMIT 1
+   (0.1ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.8ms)  INSERT INTO "switchman_shards" ("database_server_id") VALUES ($1) RETURNING "id"  [["database_server_id", "1"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.4ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.6ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' ORDER BY "switchman_shards"."id" ASC LIMIT 1
+   (0.1ms)  BEGIN
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "switchman_shards" ("database_server_id") VALUES ($1) RETURNING "id"  [["database_server_id", "1"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+Connecting to database specified by database.yml
+   (0.4ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.5ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' LIMIT 1

data/spec/lib/active_record/connection_pool_spec.rb

@@ -37,6 +37,8 @@ module Switchman
           @pool.checkin(@conn)
           @pool.clear_idle_connections!(@conn.last_query_at + 1)
           expect(@pool.connections).to be_empty
+          # fresh connection
+          expect(@pool.connection).to_not eq @conn
         end
 
         it "should not affect idle but checked out connections" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties