refactor timeout exception handling

binarycode · ioquatix · commit 35b12b38015f · 2020-02-04T01:19:00.000+13:00
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -41,10 +41,6 @@ class Adapter < ::Faraday::Adapter
 					IOError,
 					SocketError
 				].freeze
-				TIMEOUT_EXCEPTIONS = [
-					Errno::ETIMEDOUT,
-					Async::TimeoutError
-				].freeze
 
 				def initialize(*arguments, **options, &block)
 					super
@@ -68,7 +64,7 @@ def call(env)
 					end
 					
 					return @app.call(env)
-				rescue *TIMEOUT_EXCEPTIONS => e
+				rescue Errno::ETIMEDOUT => e
 					raise ::Faraday::TimeoutError, e
 				rescue OpenSSL::SSL::SSLError => e
 					raise ::Faraday::SSLError, e
@@ -83,7 +79,7 @@ def call(env)
 
 				def with_timeout
 					if @timeout
-						Async::Task.current.with_timeout(@timeout) do
+						Async::Task.current.with_timeout(@timeout, ::Faraday::TimeoutError) do
 							yield
 						end
 					else
