From 92ba1a12ce478afb73422f0ef4aad951fc046502 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Fri, 5 Apr 2024 09:43:25 +0200 Subject: [PATCH 1/5] chore: use space instead of tab --- app/lib/api_entreprise/api.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/api_entreprise/api.rb b/app/lib/api_entreprise/api.rb index 90f71b14e..ca2d9d7c1 100644 --- a/app/lib/api_entreprise/api.rb +++ b/app/lib/api_entreprise/api.rb @@ -126,7 +126,7 @@ class APIEntreprise::API elsif response.code == 400 raise Error::BadFormatRequest.new(response) elsif response.code == 502 - raise Error::BadGateway.new(response) + raise Error::BadGateway.new(response) elsif response.code == 503 raise Error::ServiceUnavailable.new(response) elsif response.timed_out? From 23060da306f4f593ee5617069e701a5ad632bac1 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Fri, 5 Apr 2024 09:42:55 +0200 Subject: [PATCH 2/5] fix: do not url encode error message in sentry --- app/lib/api_entreprise/api/error.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/api_entreprise/api/error.rb b/app/lib/api_entreprise/api/error.rb index 7a37417f5..1178d9b08 100644 --- a/app/lib/api_entreprise/api/error.rb +++ b/app/lib/api_entreprise/api/error.rb @@ -6,7 +6,7 @@ class APIEntreprise::API::Error < ::StandardError msg = <<~TEXT url: #{uri.host}#{uri.path} HTTP error code: #{response.code} - body: #{CGI.escape(response.body)} + body: #{response.body} curl message: #{response.return_message} total time: #{response.total_time} connect time: #{response.connect_time} From 71a5876af1f6118e4048537ae8c85501ac373bab Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Tue, 2 Apr 2024 17:35:21 +0200 Subject: [PATCH 3/5] limit api_entreprise sidekiq job to one thread --- config/initializers/sidekiq.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index f1ccf9ab1..a7f9cfa6e 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -24,6 +24,11 @@ if ENV.has_key?('REDIS_SIDEKIQ_SENTINELS') if ENV['SKIP_RELIABLE_FETCH'].blank? Sidekiq::ReliableFetch.setup_reliable_fetch!(config) end + + config.capsule('api_entreprise') do |cap| + cap.concurrency = 1 + cap.queues = ['api_entreprise'] + end end Sidekiq.configure_client do |config| From c8a64f8057add394172e281cbe0e6df3ab7a0507 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Tue, 2 Apr 2024 17:34:42 +0200 Subject: [PATCH 4/5] move api_entreprise::entreprise_job to sidekiq --- config/initializers/transition_to_sidekiq.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/initializers/transition_to_sidekiq.rb b/config/initializers/transition_to_sidekiq.rb index 6dd570e85..76f64335b 100644 --- a/config/initializers/transition_to_sidekiq.rb +++ b/config/initializers/transition_to_sidekiq.rb @@ -57,5 +57,9 @@ if Rails.env.production? && SIDEKIQ_ENABLED class Cron::CronJob < ApplicationJob self.queue_adapter = :sidekiq end + + class APIEntreprise::EntrepriseJob < APIEntreprise::Job + self.queue_adapter = :sidekiq + end end end From db8c595acaff75d31acbdf4223127c31be6907ad Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Tue, 9 Apr 2024 14:22:02 +0200 Subject: [PATCH 5/5] move all the api_entreprise_job to sidekiq --- config/initializers/transition_to_sidekiq.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/transition_to_sidekiq.rb b/config/initializers/transition_to_sidekiq.rb index 76f64335b..2c1c95403 100644 --- a/config/initializers/transition_to_sidekiq.rb +++ b/config/initializers/transition_to_sidekiq.rb @@ -58,7 +58,7 @@ if Rails.env.production? && SIDEKIQ_ENABLED self.queue_adapter = :sidekiq end - class APIEntreprise::EntrepriseJob < APIEntreprise::Job + class APIEntreprise::Job < ApplicationJob self.queue_adapter = :sidekiq end end