mongoid_connection_pool 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eb370db1decf12b4592bd69227d32caaf49f03c
-  data.tar.gz: 7a36ee9d22077e96ec85ff63d88c098ce84be334
+  metadata.gz: 69d78c78604de9d695873035b133f3cde20fe572
+  data.tar.gz: 3cd12dbf3489078ca42582be4132ef595982bd9b
 SHA512:
-  metadata.gz: 28663a2b586314764cd4813653785cf890d795cb00b0ffef220a5b56f868c05d4fd49dc6e0e407f5d083bbb27cb6b62ebdbf52de4f0dd31271091ae668ff2bab
-  data.tar.gz: 4a59a7b89391b3c085fe532b95a697acd74a296d061c5171c8b1169c16c2b39892e62cbc3676092e4f9e616aa51013266790d9d39b6c896b88d18a407584603f
+  metadata.gz: 01465e5e98df34e18fbd2b55cc9596e96f4a353e0c0172c2f726cf69242e2db8891cf4bb94dd6484d34f33bb2b7b0dd6e0f4cdbd84d657dd3db4cf1f351447fb
+  data.tar.gz: 27a342a83a2acd3ca5c5a6f524bc8be7b1aa10fdf0084ae571726a20c9db8fe36bfca65636109c608645277a5faa86695b41dc27f92c29570b6ca2251538bcde

data/lib/mongoid_connection_pool/mongoid/sessions.rb

@@ -9,17 +9,8 @@ module Mongoid
       end
 
       def session_pool(name=:default)
-        if !@session_pool || !@session_pool[name]
-          synchronize do
-            @session_pool ||= {}
-            @session_pool[name] ||= SessionPool.new(
-              :size             => Config.session_pool_size,
-              :name             => name,
-              :checkout_timeout => Config.session_checkout_timeout,
-              :reap_frequency   => Config.session_reap_frequency)
-          end
-        end
-        @session_pool[name]
+        synchronize { @session_pool ||= ThreadSafe::Cache.new }
+        @session_pool.fetch(name) { build_session_pool(name) }
       end
 
       def disconnect(thread=Thread.current)
@@ -40,7 +31,7 @@ module Mongoid
       end
 
       def with_name(name)
-        session_pool(name).session_for_thread(Thread.current) ||
+        session_pool(name).session_for(Thread.current) ||
           session_pool(name).checkout
       end
 
@@ -56,6 +47,14 @@ module Mongoid
         session_pool(name).checkin_from_thread thread
         true
       end
+
+      def build_session_pool(name)
+        @session_pool[name] = SessionPool.new(
+          :size             => Config.session_pool_size,
+          :name             => name,
+          :checkout_timeout => Config.session_checkout_timeout,
+          :reap_frequency   => Config.session_reap_frequency)
+      end
     end
   end
 end

data/lib/mongoid_connection_pool/mongoid/sessions/session_pool.rb

@@ -114,22 +114,24 @@ module Mongoid
       end
 
       def checkout
-        unless (session = session_for_thread(Thread.current))
-          synchronize do
+        synchronize do
+          unless (session = session_for(Thread.current))
             session = get_session
             reserve(session)
           end
+          session
         end
-        session
       end
 
       # Returns a session back to the available pool
       def checkin(session)
-        synchronize do
-          @available.add session
-          release(session)
+        if session
+          synchronize do
+            @available.add session
+            release(session)
+          end
+          true
         end
-        true
       end
 
       def clear(thread=nil)
@@ -159,7 +161,7 @@ module Mongoid
       end
 
       def checkin_from_thread(thread)
-        checkin @reserved_sessions[thread]
+        checkin session_for(thread)
         true
       end
 
@@ -174,10 +176,6 @@ module Mongoid
         end
       end
 
-      def session_for_thread(thread)
-        @reserved_sessions[thread]
-      end
-
       def session_for(thread)
         @reserved_sessions[thread]
       end

data/lib/mongoid_connection_pool/version.rb

@@ -1,3 +1,3 @@
 module MongoidConnectionPool
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,31 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_connection_pool
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Brian Goff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -33,13 +38,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -47,13 +52,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: mongoid
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
+        version: 3.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -61,13 +66,13 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: thread_safe
+        version: 0.1.3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -75,11 +80,6 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 description: Provides connection pooling for Mongoid
 email:
 - cpuguy83@gmail.com
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides connection pooling for Mongoid