activerecord-refresh_connection 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52a01f4786ed07aa416bbd7e9bdb9af656fd2b77
-  data.tar.gz: f213332480d2531baaea3352bfca9547573b825c
+  metadata.gz: e259517a798ec5e215eb057c367e1cc465998953
+  data.tar.gz: 1b1f7509fad904e1408d78aaaa100f3614d408af
 SHA512:
-  metadata.gz: 056a7d5b883e637ecf7fb75bed37bb279ab9f4b3f5b75453628b6c1b8dfa96a86dcc8461e579696de83f56dbb705bd8d94ddff36532f4cd646f255e6e7f5b89d
-  data.tar.gz: 85514a7826551be9fe120d49a8ddc343bdfe109aba2f1bb485bb94c4728ed79101295508c2b6fb5b892f2087e7c0c2f1c532a56e3ad2456f843577e6a948663d
+  metadata.gz: 6d592cb7813e276c1292378533238e8fd675bc07519c0b736da72c92bec9bf54c0622518199440c686c19caf3a5d17613e09980418a05f7342f354590d82959e
+  data.tar.gz: f0b89ad7852982561fb7a6f9084ff90205e011650ef635682133561c2a49b12248b92032cb205b8e498208670d2131bcab916f9f6da8eebbb3051090c3606416

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.2
+
+Enhancements:
+
+* Add `max_requests` option (thanks to @ryotarai)
+
 ## 0.0.1
 
 First version

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in sql-maker.gemspec
 gemspec
 gem 'coveralls', :require => false

data/README.md

@@ -22,7 +22,7 @@ $ bundle
 
 ## How to Use
 
-This gem provides a rack middleware `ActiveRecord::ConnectionAdapters::RefreshConnectionManagement` which disconnects all connections in each rack request. 
+This gem provides a rack middleware `ActiveRecord::ConnectionAdapters::RefreshConnectionManagement` which disconnects all connections in each rack request, which results in refreshing all connections in each rack request. 
 
 ### Rails
 
@@ -30,12 +30,14 @@ Swap the default rails ConnectionManagement.
 
 ```ruby
 # config/application.rb
-require 'activerecord-refresh_connection'
-
 class Application < Rails::Application
-  config.autoload_paths += %W(#{config.root}/lib)
   config.middleware.swap ActiveRecord::ConnectionAdapters::ConnectionManagement,
     "ActiveRecord::ConnectionAdapters::RefreshConnectionManagement"
+
+  ## If you would like to clear connections after 5 requests:
+  # config.middleware.insert_before ActiveRecord::ConnectionAdapters::ConnectionManagement,
+  #   "ActiveRecord::ConnectionAdapters::RefreshConnectionManagement", max_requests: 5
+  # config.middleware.delete ActiveRecord::ConnectionAdapters::ConnectionManagement
 end
 ```
 
@@ -47,7 +49,21 @@ bundle exec rake middleware
 
 ### Sinatra
 
-To Be Written
+```ruby
+# config.ru
+require 'activerecord-refresh_connection'
+
+use ActiveRecord::ConnectionAdapters::RefreshConnectionManagement
+
+## If you would like to clear connections after 5 requests:
+# use ActiveRecord::ConnectionAdapters::RefreshConnectionManagement, max_requests: 5
+
+run App
+```
+
+## See Also
+
+* [例えば ActiveRecord の connection_pool を止める - sonots:blog](http://blog.livedoor.jp/sonots/archives/38797925.html) (Japanese)
 
 ## ChangeLog
 

data/Rakefile

@@ -9,6 +9,6 @@ task :default => :spec
 
 desc 'Open an irb session preloaded with the gem library'
 task :console do
-    sh 'irb -rubygems -I lib -r sql-maker'
+    sh 'irb -rubygems -I lib -r activerecord-refresh_connection'
 end
 task :c => :console

data/activerecord-refresh_connection.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-refresh_connection"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Naotoshi Seo"]
   spec.email         = ["sonots@gmail.com"]
   spec.summary       = %q{Refresh ActiveRecord connection on each rack request}

data/lib/activerecord-refresh_connection/active_record/connection_adapters/refresh_connection_management.rb

@@ -1,24 +1,54 @@
 module ActiveRecord
   module ConnectionAdapters
     class RefreshConnectionManagement
-      def initialize(app)
+      DEFAULT_OPTIONS = {max_requests: 1}
+
+      def initialize(app, options)
         @app = app
+        @options = DEFAULT_OPTIONS.merge(options)
+        @mutex = Mutex.new
+
+        reset_remain_count
       end
 
       def call(env)
         testing = env.key?('rack.test')
 
         response = @app.call(env)
+
+        clear_connections = should_clear_connections? && !testing
+
         response[2] = ::Rack::BodyProxy.new(response[2]) do
           # disconnect all connections on the connection pool
-          ActiveRecord::Base.clear_all_connections! unless testing
+          ActiveRecord::Base.clear_all_connections! if clear_connections
         end
 
         response
       rescue Exception
-        ActiveRecord::Base.clear_all_connections! unless testing
+        ActiveRecord::Base.clear_all_connections! if clear_connections
         raise
       end
+
+      private
+
+      def should_clear_connections?
+        return true if max_requests <= 1
+
+        @mutex.synchronize do
+          @remain_count -= 1
+          (@remain_count <= 0).tap do |clear|
+            reset_remain_count if clear
+          end
+        end
+      end
+
+      def reset_remain_count
+        @remain_count = max_requests
+      end
+
+      def max_requests
+        @options[:max_requests]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-refresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord