faraday_persistent_excon 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b49291915114840bdc8500809c0338cb16acb537
-  data.tar.gz: d75a470fc5b2d259296a7e3c1c435fa07ebfdc52
+  metadata.gz: 60b6db2679ae22d227327fe73885fe687bdfd026
+  data.tar.gz: 8a40b8f2860d2cabf0fdb4a123985a5bf5a8d1c9
 SHA512:
-  metadata.gz: 28cd3c1d94b313c19c0e3c6826a2375d8b43fdf5e1cf9e91539c9ac679c748b7f845ea5a6b5c76712a0d9ab5b8a0f020c4ba02256b427034a398acff115d64ca
-  data.tar.gz: 25111dfd1ebc547cedf44e81dbfc4486174a89cffdd459e4d15affd91a9b94a8ff79193c75edc441070ffc330cf6c2965db6829423797e85b1ba6915ca56d7c0
+  metadata.gz: 7183a66296ca9d76e6a8968fc4d9627a03c1450e70363f4d18266603ea7017cb797de4dd4e1e97615195f2302695701d689e3aca10185907e492b283b889dc23
+  data.tar.gz: 86a3e03601d0657125d31656a89460f6a448fd66a14b1e888108ae1836e5a06ed7bbed56a5c72307689b5bec419ab1f577a5e94b5ee1281a3587f36f6c0b1aff

data/README.md

@@ -33,7 +33,7 @@ Excon.defaults[:tcp_nodelay] = true
 Faraday.default_adapter = :persistent_excon
 FaradayPersistentExcon.connection_pools = {
   'https://search.example.com' => { size: 5 },
-  'http://localhost:9200' => { size: 10, timeout: 2 }
+  'http://localhost:9200' => { size: 10, timeout: 2, idle_timeout: 300 }
 }
 ```
 

data/lib/faraday_persistent_excon.rb

@@ -9,6 +9,7 @@ require 'faraday_persistent_excon/perform_request'
 require 'faraday_persistent_excon/adapter'
 require 'faraday_persistent_excon/request_options'
 require 'faraday_persistent_excon/connection_pools'
+require 'faraday_persistent_excon/connection'
 
 module FaradayPersistentExcon
   class << self
@@ -17,6 +18,7 @@ module FaradayPersistentExcon
     attr_accessor :connection_pools
     attr_accessor :idempotent_methods
     attr_accessor :retry_idempotent_methods
+    attr_accessor :idle_timeout
   end
 
   self.excon_options = {}
@@ -24,6 +26,7 @@ module FaradayPersistentExcon
   self.connection_pools = {}
   self.idempotent_methods = %w[GET HEAD PUT DELETE OPTIONS TRACE]
   self.retry_idempotent_methods = true
+  self.idle_timeout = 60
 end
 
 Faraday::Adapter.register_middleware persistent_excon: ->{ FaradayPersistentExcon::Adapter }

data/lib/faraday_persistent_excon/connection.rb

@@ -0,0 +1,26 @@
+module FaradayPersistentExcon
+  class Connection
+    attr_accessor :excon
+    attr_accessor :last_use
+    attr_accessor :idle_timeout
+
+    def initialize(excon:, idle_timeout:)
+      @excon = excon
+      @idle_timeout = idle_timeout
+    end
+
+    def reset
+      excon.reset
+    end
+
+    def expired?
+      return false if last_use.nil?
+
+      Time.now.utc - last_use > idle_timeout
+    end
+
+    def used!
+      self.last_use = Time.now.utc
+    end
+  end
+end

data/lib/faraday_persistent_excon/connection_pools.rb

@@ -10,7 +10,14 @@ module FaradayPersistentExcon
         pool = self.connection_pool_for(url)
 
         if pool
-          pool.with(&block)
+          pool.with do |conn|
+            begin
+              conn.reset if conn.expired?
+              block.call(conn.excon)
+            ensure
+              conn.used!
+            end
+          end
         else
           # No pool configured.  Use normal connection
           block.call(::Excon.new(url, persistent: false))
@@ -23,7 +30,14 @@ module FaradayPersistentExcon
         if config
           self.__pools.fetch_or_store(url) do
             ::ConnectionPool.new(config) do
-              ::Excon.new(url, persistent: true, thread_safe_sockets: false)
+              Connection.new(
+                excon: ::Excon.new(
+                  url,
+                  persistent: true,
+                  thread_safe_sockets: false
+                ),
+                idle_timeout: config.fetch(:idle_timeout, FaradayPersistentExcon.idle_timeout)
+              )
             end
           end
         end

data/lib/faraday_persistent_excon/version.rb

@@ -1,3 +1,3 @@
 module FaradayPersistentExcon
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday_persistent_excon
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -141,6 +141,7 @@ files:
 - faraday_persistent_excon.gemspec
 - lib/faraday_persistent_excon.rb
 - lib/faraday_persistent_excon/adapter.rb
+- lib/faraday_persistent_excon/connection.rb
 - lib/faraday_persistent_excon/connection_pools.rb
 - lib/faraday_persistent_excon/perform_request.rb
 - lib/faraday_persistent_excon/request_options.rb