em_aws 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -32,13 +32,13 @@ GEM
     eventmachine (1.0.0-java)
     http_parser.rb (0.5.3)
     http_parser.rb (0.5.3-java)
-    httparty (0.9.0)
+    httparty (0.10.0)
       multi_json (~> 1.0)
       multi_xml
     json (1.7.6)
     json (1.7.6-java)
     multi_json (1.5.0)
-    multi_xml (0.5.1)
+    multi_xml (0.5.2)
     nokogiri (1.5.6)
     nokogiri (1.5.6-java)
     rspec (2.12.0)

data/README.md

@@ -10,7 +10,7 @@ em_aws is available through [Rubygems](https://rubygems.org/gems/em_aws) and can
 ## Rails 3 setup (no rails 2 sorry)
 Setup [AWS-SDK-Ruby](https://github.com/aws/aws-sdk-ruby/blob/master/README.rdoc) as you would normally.
 
-Assuming you've already setup async-rails, add em_aws to you gemfile:
+Assuming you've already setup async-rails, add em_aws to your gemfile:
     
     gem 'em_aws'
 
@@ -49,7 +49,8 @@ are created lazy, so pools grow until they meet the set pool size.
     )
 
 ## Streaming
-Requires [AWS-SKD-Ruby >= 1.6.3] (http://aws.amazon.com/releasenotes/Ruby/5728376747252106)
+Requires [AWS-SKD-Ruby >= 1.6.3](http://aws.amazon.com/releasenotes/Ruby/5728376747252106)
+
     EM.synchrony do
       s3 = AWS::S3.new 
       file = File.open("path_to_file")
@@ -59,9 +60,9 @@ Requires [AWS-SKD-Ruby >= 1.6.3] (http://aws.amazon.com/releasenotes/Ruby/572837
 
 ## Asynchronous Requests
 Requests can be set to perform asynchronously, returning nil initially and performing
-the actions in the background. If the request option :async are set to true that only
-that request request will handled asynchronously. If the client option :async all requests will 
-be handled asynchronously.
+the actions in the background. If the request option :async are set to true, only
+that request will be handled asynchronously. If the client option :async is set to true,
+all requests will be handled asynchronously.
 
     EM.synchrony do
       s3 = AWS::S3.new

data/lib/aws/core/http/em_connection_pool.rb

@@ -8,9 +8,7 @@ module AWS
       class EMConnectionPool
         # Since AWS connections may be to any number of urls, the connection
         # pool is a hash of connection arrays, instead of a simple array like
-        # most connection pools
-        # Stores data concerning pools, like current size, last fetched
-        # 
+        # most connection pools        # 
         # Options:
         # * :pool_size - number of connections for each pool
         # * :inactivity_timeout - number of seconds to wait before disconnecting, 
@@ -27,20 +25,24 @@ module AWS
           @pool_size = (options[:pool_size] || 5)
           @never_block = (options[:never_block])
           @inactivity_timeout = (options[:inactivity_timeout].to_i)
+          @connect_timeout = options[:connect_timeout]
           @pool_timeout = (options[:pool_timeout] || 0.5) 
+          @fibered_mutex = EM::Synchrony::Thread::Mutex.new  # A fiber safe mutex
         end
-        
-        # A fiber safe mutex
-        def _fiber_mutex
-          @fibered_mutex ||= EM::Synchrony::Thread::Mutex.new
+       
+        # Run the block on the retrieved connection. Then return the connection
+        # back to the pool.
+        def run(url, &block)
+          connection = santize_connection(fetch_connection(url))
+          block.call(connection)
+        ensure
+          return_connection(url,connection) 
         end
         
         # Returns a pool for the associated url
         def available_pools(url)
-          _fiber_mutex.synchronize do
-            add_connection(url) if add_connection?(url)
-            @pools[url]
-          end
+          add_connection(url) if add_connection?(url)
+          @pools[url]
         end
         
         def add_connection?(url)
@@ -61,36 +63,9 @@ module AWS
         end
         
         def new_connection(url)
-          EM::HttpRequest.new(url, :inactivity_timeout => @inactivity_timeout)
-        end
-        
-        # Run the block on the retrieved connection, then return the connection
-        # back to the pool.
-        def run(url, &block)
-          connection = santize_connection(fetch_connection(url))
-          block.call(connection)
-        ensure
-          return_connection(url,connection) 
-        end
-        
-        # Fetch an available connection or raise an error
-        def fetch_connection(url)         
-          connection = nil
-          alarm = (Time.now + @pool_timeout)       
-          # block until we get an available connection or Timeout::Error     
-          while connection.nil?
-            if alarm <= Time.now
-              message = "Could not fetch a free connection in time. Consider increasing your connection pool for em_aws or setting :never_block to true."
-              AWS.config.logger.error message
-              raise Timeout::Error, message
-            end
-            connection = available_pools(url).shift
-            if connection.nil? && (@never_block)
-              AWS.config.logger.info "Adding AWS connection to #{url} for never_block, will not be returned to pool."
-              connection = new_connection(url)
-            end
-          end
-          connection    
+          opts = {:inactivity_timeout => @inactivity_timeout}
+          opts[:connect_timeout] = @connect_timeout if @connect_timeout
+          EM::HttpRequest.new(url, opts)
         end
         
         # Make sure we have a good connection.
@@ -103,13 +78,35 @@ module AWS
           connection
         end
         
+        # Fetch an available connection or raise an error
+        def fetch_connection(url)         
+          alarm = (Time.now + @pool_timeout)       
+          # block until we get an available connection or Timeout::Error   
+          @fibered_mutex.synchronize do
+            loop do
+              if alarm <= Time.now
+                message = "Could not fetch a free connection in time. Consider increasing your connection pool for em_aws or setting :never_block to true."
+                AWS.config.logger.error message
+                raise Timeout::Error, message
+              end
+              connection = available_pools(url).shift
+              if connection.nil? && (@never_block)
+                AWS.config.logger.info "Adding AWS connection to #{url} for never_block, will not be returned to pool."
+                connection = new_connection(url)
+              end
+              return connection if connection
+            end
+          end
+        end
+        
         # Return connections to pool if allowed, otherwise closes connection
+        # We return connections to the front of the pool to keep them active.
         def return_connection(url,connection)
-          _fiber_mutex.synchronize do
+          @fibered_mutex.synchronize do
             if (@pools[url].nil? || (@pools[url].length == @pool_size))
               connection.conn.close_connection if connection.conn
             else
-              @pools[url] << connection 
+              @pools[url].insert(0,connection)
             end
             @pools[url]
           end

data/lib/em_aws/version.rb

@@ -1,3 +1,3 @@
 module EmAws
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/em_http_handler_spec.rb

@@ -90,7 +90,8 @@ module AWS::Core
         context 'too many retries' do
           it "should have network error" do
             EM.synchrony do
-              handler.send(:process_request,(req),(resp),3)
+              resp.stub(:status).and_return(0)
+              handler.send(:process_request,(req),(resp),false,3)
               resp.network_error?.should be_true
               EM.stop
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em_aws
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk