Consistently use net_http_persistent with a memorized Faraday object

Author: MrSerth

app/services/exercise_service.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class ExerciseService < ServiceBase
+  def self.connection
+    @connection ||= Faraday.new do |faraday|
+      faraday.options[:open_timeout] = 5
+      faraday.options[:timeout] = 5
+
+      faraday.adapter :net_http_persistent
+    end
+  end
+end

app/services/exercise_service/check_external.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-module ExerciseService
-  class CheckExternal < ServiceBase
+class ExerciseService
+  class CheckExternal < ExerciseService
     def initialize(uuid:, codeharbor_link:)
       super()
       @uuid = uuid
       @codeharbor_link = codeharbor_link
     end
 
     def execute
-      response = connection.post do |req|
+      response = self.class.connection.post @codeharbor_link.check_uuid_url do |req|
         req.headers['Content-Type'] = 'application/json'
         req.headers['Authorization'] = "Bearer #{@codeharbor_link.api_key}"
         req.body = {uuid: @uuid}.to_json
@@ -30,14 +30,5 @@ def message(task_found, update_right)
         I18n.t('exercises.export_codeharbor.check.no_task')
       end
     end
-
-    def connection
-      Faraday.new(url: @codeharbor_link.check_uuid_url) do |faraday|
-        faraday.options[:open_timeout] = 5
-        faraday.options[:timeout] = 5
-
-        faraday.adapter Faraday.default_adapter
-      end
-    end
   end
 end

app/services/exercise_service/push_external.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module ExerciseService
-  class PushExternal < ServiceBase
+class ExerciseService
+  class PushExternal < ExerciseService
     def initialize(zip:, codeharbor_link:)
       super()
       @zip = zip
@@ -11,7 +11,7 @@ def initialize(zip:, codeharbor_link:)
     def execute
       body = @zip.string
       begin
-        response = connection.post do |request|
+        response = self.class.connection.post @codeharbor_link.push_url do |request|
           request.headers['Content-Type'] = 'application/zip'
           request.headers['Content-Length'] = body.length.to_s
           request.headers['Authorization'] = "Bearer #{@codeharbor_link.api_key}"
@@ -23,13 +23,5 @@ def execute
         e.message
       end
     end
-
-    private
-
-    def connection
-      Faraday.new(url: @codeharbor_link.push_url) do |faraday|
-        faraday.adapter Faraday.default_adapter
-      end
-    end
   end
 end

lib/runner/strategy/poseidon.rb

@@ -311,12 +311,18 @@ def self.headers
 
   def self.http_connection
     @http_connection ||= Faraday.new(ssl: {ca_file: config[:ca_file]}, headers:) do |faraday|
+      faraday.options[:open_timeout] = 5
+      faraday.options[:timeout] = 5
+
       faraday.adapter :net_http_persistent
     end
   end
 
   def self.new_http_connection
     Faraday.new(ssl: {ca_file: config[:ca_file]}, headers:) do |faraday|
+      faraday.options[:open_timeout] = 5
+      faraday.options[:timeout] = 5
+
       faraday.adapter :net_http
     end
   end

spec/services/exercise_service/check_external_spec.rb

@@ -74,7 +74,11 @@
     end
 
     context 'when the request fails' do
-      before { allow(Faraday).to receive(:new).and_raise(Faraday::Error, 'error') }
+      before do
+        # Un-memoize the connection to force a reconnection
+        described_class.instance_variable_set(:@connection, nil)
+        allow(Faraday).to receive(:new).and_raise(Faraday::Error, 'error')
+      end
 
       it 'returns the correct hash' do
         expect(check_external_service).to eql(error: true, message: I18n.t('exercises.export_codeharbor.error'))

spec/services/exercise_service/push_external_spec.rb

@@ -56,7 +56,11 @@
     end
 
     context 'when an error occurs' do
-      before { allow(Faraday).to receive(:new).and_raise(StandardError) }
+      before do
+        # Un-memoize the connection to force a reconnection
+        described_class.instance_variable_set(:@connection, nil)
+        allow(Faraday).to receive(:new).and_raise(StandardError)
+      end
 
       it { is_expected.not_to be_nil }
     end