uv-rays 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3a91e56b903ef1b846c68c6767f21a08fb4a1006
-  data.tar.gz: a56ddf829bcc85cd2f827576a84aadadeb8dc912
+SHA256:
+  metadata.gz: 47a75f7ad78665269e270dc125d92b9c72c57375a3c6cb2c706d8c03b2b80748
+  data.tar.gz: df2eef272ef2b7778eb24440f6b1526881eb361fd4f0118ae63995c0d0c54ad7
 SHA512:
-  metadata.gz: 284d7f5e131d15b096a876014c43d38cc2710d054676560ae1561108ee6b69964d0f38cd13c6e3ab4ccd27ad322b28c3df82bf283495ae06b365c1a0cd90ee71
-  data.tar.gz: 541392cb4958db21654c2d378bca79dda0eac86d482fd0e5d3c951927c2d11439cddd9ebd95f8047ed55164e7091ad5c3ff06db749532862528f5a43a03710f6
+  metadata.gz: de3157500008ced5a6a5e2a980033acadb4243a9aa78243947e0227024df65123e0abbb6fef36d9c30fadb397cc609207dc511a61b12f17c142fb327c6be798c
+  data.tar.gz: 432b658361131fa76d68e445ad91a84aef4db530d428874b9a2ba326a6e85ba14db59562b8b1464438049a4f6a19865a562a766a918114595bf484a47233f8ec

data/lib/uv-rays/http_endpoint.rb

@@ -163,6 +163,9 @@ module UV
             @tls = @scheme == 'https'
             @cookiejar = CookieJar.new
             @middleware = []
+
+            @closing = false
+            @connecting = false
         end
 
 
@@ -190,15 +193,18 @@ module UV
                 if response.keep_alive
                     restart_timer
                 else
-                    close_connection
+                    # We might have already started processing the next request
+                    # at this point. So don't want to disconnect if already
+                    # disconnected.
+                    close_connection unless @connecting
                 end
 
                 next_request
 
                 response
             }, proc { |err|
-                @parser.eof
-                close_connection
+                # @parser.eof
+                close_connection unless @connecting
                 next_request
                 ::Libuv::Q.reject(@thread, err)
             })
@@ -211,6 +217,10 @@ module UV
 
         # Callbacks
         def connection_ready
+            # A connection can be closed while still connecting
+            return if @closing
+
+            @connecting = false
             if @queue.length > 0
                 restart_timer
                 next_request
@@ -220,16 +230,23 @@ module UV
         end
 
         def connection_closed(request, reason)
+            # A connection might close due to a connection failure
+            awaiting_close = @closing
+            awaiting_connect = @connecting
+            @closing = false
+            @connecting = false
+            @connection = nil
+
             # We may have closed a previous connection
             if @parser.request && (request.nil? || request == @parser.request)
-                @connection = nil
                 stop_timer
-
                 @parser.eof
             elsif request.nil? && @parser.request.nil? && @queue.length > 0
                 req = @queue.pop
                 req.reject(reason || :connection_failure)
             end
+
+            next_request if awaiting_close || awaiting_connect
         end
 
         def data_received(data)
@@ -258,6 +275,8 @@ module UV
 
 
         def next_request
+            # Don't start a request while transitioning state
+            return if @closing || @connecting
             return if @parser.request || @queue.length == 0
 
             if @connection
@@ -272,7 +291,10 @@ module UV
         end
 
         def new_connection
+            # no new connections while transitioning state
+            return if @closing || @connecting
             if @queue.length > 0 && @connection.nil?
+                @connecting = true
                 @connection = Connection.new(@host, @port, @tls, @proxy, self)
                 start_timer
             end
@@ -280,14 +302,17 @@ module UV
         end
 
         def close_connection
-            return if @connection.nil?
-            @connection.close_connection(@parser.request)
+            # Close connection can be called while connecting
+            return if @closing || @connection.nil?
+            @closing = true
+            @connection.close_connection
             stop_timer
             @connection = nil
         end
 
-
         def start_timer
+            # Only start the timer if there is a connection starting or in place
+            return if @closing || @connection.nil?
             @timer.cancel if @timer
             @timer = @thread.scheduler.in(@inactivity_timeout) do
                 @timer = nil
@@ -302,9 +327,10 @@ module UV
         end
 
         def idle_timeout
-            @parser.reason = :timeout if @parser.request
-            @connection.reason = :timeout
+            connection = @connection
             close_connection
+            @parser.reason = :timeout if @parser.request
+            connection.reason = :timeout if connection
         end
     end
 end

data/lib/uv-rays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UV
-    VERSION = '2.4.6'
+    VERSION = '2.4.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
@@ -266,7 +266,6 @@ files:
 - spec/ping_spec.rb
 - spec/scheduler_spec.rb
 - spec/scheduler_time_spec.rb
-- spec/zen_spec.rb
 - uv-rays.gemspec
 homepage: https://github.com/cotag/uv-rays
 licenses:
@@ -288,13 +287,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Abstractions for working with Libuv
 test_files:
 - spec/scheduler_time_spec.rb
-- spec/zen_spec.rb
 - spec/ping_spec.rb
 - spec/http_endpoint_spec.rb
 - spec/connection_spec.rb

data/spec/zen_spec.rb

@@ -1,27 +0,0 @@
-require 'libuv'
-require 'set'
-
-
-describe Libuv::Listener do
-	it "should ensure there are no remaining object references in callbacks", network: true do
-		require 'objspace'
-
-		checked = Set.new
-
-		# These are created by loop objects and are never cleaned up
-		# This is OK as the loops are expected to execute for the life of the application
-		except = []
-
-		ObjectSpace.each_object(Class) do |cls|
-			next unless cls.ancestors.include? ::UV::Connection
-			next if checked.include? cls
-			checked << cls
-		end
-
-		if checked.length > 0
-			puts "\nMemory Leak in #{checked.inspect}"
-		end
-
-		expect(checked.length).to be(0)
-	end
-end