restify 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 218f1484655662a863e6d65ae81f8f1cfe5e3127f9c795748b150236fe137225
-  data.tar.gz: 440710396a4f3879ad78766ef074edc85a51c5e40b7b8a3ac685e41b5060abf3
+  metadata.gz: 05b4120c9755cdd5a88f172e3d5964eff3804add46785bd3cbec8b842f2af459
+  data.tar.gz: 5cb09e31e263560b373b156cfaa601925b9bde328ff892d4533c2738b10dff67
 SHA512:
-  metadata.gz: 1d065b2b0b1080d937e311dcc7f820c41fad880262112887d57e5051888a069244809b3dd3e14307ce553277c82b8d56f602f5b891178f3df78b82aa45c13655
-  data.tar.gz: a4fd01db3ece23055dc2b3d4c297f5caf06bb93294cc4e9cd79a72fcca87340014d5f03b90603be32a2dff8006df6fb3a6375056258cae2e669643dca4024ef1
+  metadata.gz: a5854443d09b5d6ce73f3a68da7c76e2ed7453288b4e9ef940cfb2e437b8666f0c4f03b6602405193728751b5ee2cf46a12937196d412e3d911d7b497e947daf
+  data.tar.gz: 535598e592a526d20cb8c5d93fe4926deea1d1f92f60bf5fd003115a56841462ad6ce475d96927a09b940524c622e80730ff06c858940c2d08e4ed8396fa8359

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.4.4
+
+* Fix race condition in typhoeus adapter
+* Add `#request` to `NetworkError` to ease debugging
+
 ## 1.4.3
 
 * Add advanced logging capabilities using logging gem

data/lib/restify/adapter/typhoeus.rb

@@ -18,6 +18,7 @@ module Restify
         @sync   = sync
         @hydra  = ::Typhoeus::Hydra.new(**options)
         @mutex  = Mutex.new
+        @signal = ConditionVariable.new
       end
 
       def sync?
@@ -29,21 +30,28 @@ module Restify
           logger.debug { "[#{request.object_id}] Queue request #{request}" }
           @hydra.queue convert(request, writer)
           @hydra.dequeue_many
-        end
 
-        sync? ? @hydra.run : thread.run
+          if sync?
+            @hydra.run
+          else
+            thread.run
+            @signal.signal
+          end
+        end
       end
 
       def queued?
-        @mutex.synchronize do
-          @hydra.queued_requests.any? || @hydra.multi.easy_handles.count > 0
-        end
+        @mutex.synchronize { ns_queued? }
       end
 
       private
 
+      def ns_queued?
+        @hydra.queued_requests.any? || @hydra.multi.easy_handles.count > 0
+      end
+
       def convert(request, writer)
-        req = ::Typhoeus::Request.new \
+        ::Typhoeus::Request.new(
           request.uri,
           method: request.method,
           headers: DEFAULT_HEADERS.merge(request.headers),
@@ -51,20 +59,19 @@ module Restify
           followlocation: true,
           timeout: request.timeout,
           connecttimeout: request.timeout
-
-        req.on_complete do |response|
-          logger.debug { "[#{request.object_id}] Completed: #{response.code}" }
-
-          if response.timed_out?
-            writer.reject Restify::Timeout.new request
-          elsif response.code == 0
-            writer.reject Restify::NetworkError.new response.return_message
-          else
-            writer.fulfill convert_back(response, request)
+        ).tap do |req|
+          req.on_complete do |response|
+            logger.debug { "[#{request.object_id}] Completed: #{response.code}" }
+
+            if response.timed_out?
+              writer.reject Restify::Timeout.new request
+            elsif response.code == 0
+              writer.reject Restify::NetworkError.new request, response.return_message
+            else
+              writer.fulfill convert_back(response, request)
+            end
           end
         end
-
-        req
       end
 
       def convert_back(response, request)
@@ -103,8 +110,11 @@ module Restify
           @hydra.run
           logger.debug { 'Hydra finished' }
         else
-          logger.debug { 'Pause hydra thread' }
-          Thread.stop
+          @mutex.synchronize do
+            return if ns_queued?
+            logger.debug { 'Pause hydra thread' }
+            @signal.wait(@mutex)
+          end
         end
       rescue StandardError => e
         logger.error(e)

data/lib/restify/error.rb

@@ -19,6 +19,12 @@ module Restify
   # unresolvable hosts or disconnects.
   #
   class NetworkError < StandardError
+    attr_reader :request
+    
+    def initialize(request, message)
+      @request = request
+      super("[#{request.uri}] #{message}")
+    end
   end
 
   # A {ResponseError} is returned on a non-successful

data/lib/restify/version.rb

@@ -4,7 +4,7 @@ module Restify
   module VERSION
     MAJOR = 1
     MINOR = 4
-    PATCH = 3
+    PATCH = 4
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: An experimental hypermedia REST client.