Persistence is now handled automatically.

ioquatix · ioquatix · commit 717f2e07b75d · 2021-06-17T17:12:07.000+12:00
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -30,9 +30,6 @@
 module Async
 	module HTTP
 		module Faraday
-			# Detect whether we can use persistent connections:
-			PERSISTENT = ::Faraday::Connection.instance_methods.include?(:close)
-			
 			class Adapter < ::Faraday::Adapter
 				CONNECTION_EXCEPTIONS = [
 					Errno::EADDRNOTAVAIL,
@@ -46,12 +43,12 @@ class Adapter < ::Faraday::Adapter
 					IOError,
 					SocketError
 				].freeze
-
+				
 				def initialize(*arguments, **options, &block)
 					super
 					
 					@internet = Async::HTTP::Internet.new
-					@persistent = PERSISTENT && options.fetch(:persistent, true)
+					@persistent = options.fetch(:persistent, true)
 					@timeout = options[:timeout]
 				end
 				
@@ -62,19 +59,12 @@ def close
 				def call(env)
 					super
 					
-					parent = Async::Task.current?
-					
 					Sync do
 						with_timeout do
 							response = @internet.call(env[:method].to_s.upcase, env[:url].to_s, env[:request_headers], env[:body] || [])
 							
 							save_response(env, response.status, response.read, response.headers)
 						end
-					ensure
-						# If we are the top level task, even if we are persistent, we must close the connection:
-						if parent.nil? || !@persistent
-							@internet.close
-						end
 					end
 					
 					return @app.call(env)
@@ -85,9 +75,9 @@ def call(env)
 				rescue *CONNECTION_EXCEPTIONS => e
 					raise ::Faraday::ConnectionFailed, e
 				end
-
+				
 				private
-
+				
 				def with_timeout(task: Async::Task.current)
 					if @timeout
 						task.with_timeout(@timeout, ::Faraday::TimeoutError) do
