Consistently use net_http_persistent with a memorized Faraday object

Author: MrSerth

app/services/task_service.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class TaskService < 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/task_service/check_external.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
-module TaskService
-  class CheckExternal < ServiceBase
+class TaskService
+  class CheckExternal < TaskService
     def initialize(uuid:, account_link:)
       super()
       @uuid = uuid
       @account_link = account_link
     end
 
     def execute
-      response = connection.post do |req|
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['Authorization'] = authorization_header
-        req.body = {uuid: @uuid}.to_json
-      end
+      body = {uuid: @uuid}.to_json
+      response = self.class.connection.post(@account_link.check_uuid_url) {|request| request_parameters(request, body) }
       response_hash = JSON.parse(response.body, symbolize_names: true).slice(:uuid_found, :update_right)
 
       {error: false, message: message(response_hash)}.merge(response_hash)
@@ -23,8 +20,12 @@ def execute
 
     private
 
-    def authorization_header
-      "Bearer #{@account_link.api_key}"
+    def request_parameters(request, body)
+      request.tap do |req|
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Authorization'] = "Bearer #{@account_link.api_key}"
+        req.body = body
+      end
     end
 
     def message(response_hash)
@@ -38,14 +39,5 @@ def message(response_hash)
         I18n.t('tasks.task_service.check_external.no_task')
       end
     end
-
-    def connection
-      Faraday.new(url: @account_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/task_service/handle_groups.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module TaskService
+class TaskService
   class HandleGroups < ServiceBase
     def initialize(user:, task:, group_tasks_params:)
       super()

app/services/task_service/push_external.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module TaskService
-  class PushExternal < ServiceBase
+class TaskService
+  class PushExternal < TaskService
     def initialize(zip:, account_link:)
       super()
       @zip = zip
@@ -11,7 +11,7 @@ def initialize(zip:, account_link:)
     def execute
       body = @zip.string
       begin
-        response = connection.post {|request| request_parameters(request, body) }
+        response = self.class.connection.post(@account_link.push_url) {|request| request_parameters(request, body) }
         response.success? ? nil : response.body
       rescue StandardError => e
         e
@@ -28,11 +28,5 @@ def request_parameters(request, body)
         req.body = body
       end
     end
-
-    def connection
-      Faraday.new(url: @account_link.push_url) do |faraday|
-        faraday.adapter Faraday.default_adapter
-      end
-    end
   end
 end

lib/nbp/push_connector.rb

@@ -116,7 +116,15 @@ def auth
     end
 
     def api_conn
-      Faraday.new(url: settings.api_host, headers:)
+      # Refresh headers (incl. the dynamic API token) for each request
+      return @api_conn.tap {|req| req.headers = headers } if @api_conn
+
+      @api_conn ||= Faraday.new(url: settings.api_host, headers:) do |faraday|
+        faraday.options[:open_timeout] = 5
+        faraday.options[:timeout] = 5
+
+        faraday.adapter :net_http_persistent
+      end
     end
 
     def source_slug

spec/services/task_service/check_external_spec.rb

@@ -77,7 +77,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('common.errors.generic'))

spec/services/task_service/push_external_spec.rb

@@ -49,14 +49,18 @@
 
       context 'when response status is 500' do
         let(:status) { 500 }
-        let(:response) { 'an error occured' }
+        let(:response) { 'an error occurred' }
 
         it { is_expected.to be response }
       end
     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