mongoid_connection_pool 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af30e7fe5080cef0ed8640c322486fc14752172c
-  data.tar.gz: 35b4ae73ad57ae936572ea230aee5ad74e7c9c6b
+  metadata.gz: 4eb370db1decf12b4592bd69227d32caaf49f03c
+  data.tar.gz: 7a36ee9d22077e96ec85ff63d88c098ce84be334
 SHA512:
-  metadata.gz: 8a930a2324268e11bc7bbece3f0975cc967057c98736a2ec0fd6d0afcb6b502a29b88c112eb00ad4f192f77d4df524ab24337f87a1f12ed6bdbea425f11babc4
-  data.tar.gz: c86ced6234965db97d60add4c322228e6a07ed5c05ff1d6b0274aa8df81db1cb756c24f0d46db63e9e353d4de813963443759caf5598162fe5de1a52a31d9c1c
+  metadata.gz: 28663a2b586314764cd4813653785cf890d795cb00b0ffef220a5b56f868c05d4fd49dc6e0e407f5d083bbb27cb6b62ebdbf52de4f0dd31271091ae668ff2bab
+  data.tar.gz: 4a59a7b89391b3c085fe532b95a697acd74a296d061c5171c8b1169c16c2b39892e62cbc3676092e4f9e616aa51013266790d9d39b6c896b88d18a407584603f

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - rbx-19mode
+  - rbx
   - 2.0.0
   - 1.9.3
-  - jruby-19mode
+  - jruby

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

@@ -205,6 +205,8 @@ module Mongoid
       end
 
       def get_session
+        # always double check the reaper is running, if we got forked after it starts we dont have a thread anymore
+        @reaper.run unless @reaper.alive?
         if session = @available.poll
           session
         elsif @sessions.size < @size
@@ -233,14 +235,22 @@ module Mongoid
       class Reaper
         attr_reader :pool
         attr_reader :frequency
+        attr_reader :reaper
+
         def initialize(frequency, pool)
           @frequency = frequency
           @pool = pool
         end
 
+        def alive?
+          return true unless frequency
+          # under rbx 2.2.4 this now works, also works correctly under mri at latest patch levels
+          reaper.alive?
+        end
+
         def run
           return unless frequency
-          Thread.new(frequency, pool) do |t, p|
+          @reaper = Thread.new(frequency, pool) do |t, p|
             while true
               sleep t
               p.reap

data/lib/mongoid_connection_pool/version.rb

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

data/spec/session_pool_spec.rb

@@ -105,6 +105,31 @@ describe Mongoid::Sessions::SessionPool do
 
   end
 
+  describe '.checkout' do
+
+    before do
+      session_pool.clear
+    end
+
+    let(:session) do
+      session_pool.checkout
+    end
+
+    it 'Restarts the Reaper when it dies' do
+      # checkin session
+      session_pool.checkin(session)
+      # kill the reap and wait for it to die
+      session_pool.reaper.reaper.kill
+      session_pool.reaper.reaper.join
+      # reaper should now be dead
+      session_pool.reaper.reaper.alive?.should be_false
+      session_pool.checkout
+      # checkout should restart the reaper
+      session_pool.reaper.alive?.should be_true
+    end
+
+  end
+
   describe '.session_for' do
 
     before do

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_connection_pool
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Brian Goff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   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:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -113,17 +113,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Provides connection pooling for Mongoid