From b90513f4561b64fe368fe2321b0da593eac33448 Mon Sep 17 00:00:00 2001 From: Christophe Robillard Date: Thu, 11 Jun 2020 18:16:19 +0200 Subject: [PATCH 1/2] no sentry report when error 400 for exercices --- app/jobs/api_entreprise/exercices_job.rb | 3 +++ app/jobs/application_job.rb | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/jobs/api_entreprise/exercices_job.rb b/app/jobs/api_entreprise/exercices_job.rb index fd8b5c682..f288c6773 100644 --- a/app/jobs/api_entreprise/exercices_job.rb +++ b/app/jobs/api_entreprise/exercices_job.rb @@ -1,4 +1,7 @@ class ApiEntreprise::ExercicesJob < ApiEntreprise::Job + rescue_from(ApiEntreprise::API::BadFormatRequest) do |exception| + end + def perform(etablissement_id, procedure_id) etablissement = Etablissement.find(etablissement_id) etablissement_params = ApiEntreprise::ExercicesAdapter.new(etablissement.siret, procedure_id).to_params diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb index d7de32266..767b53f1a 100644 --- a/app/jobs/application_job.rb +++ b/app/jobs/application_job.rb @@ -13,10 +13,6 @@ class ApplicationJob < ActiveJob::Base error(self, exception) end - rescue_from(ApiEntreprise::API::BadFormatRequest) do |exception| - error(self, exception) - end - def error(job, exception) Raven.capture_exception(exception) end From f8b170836cb9837c4c50323b63314e42eb3a7f89 Mon Sep 17 00:00:00 2001 From: Christophe Robillard Date: Thu, 11 Jun 2020 23:09:50 +0200 Subject: [PATCH 2/2] report to sentry for BadFormatRequest and ResourceNotFound exceptions --- app/jobs/api_entreprise/job.rb | 9 +++++++++ app/jobs/application_job.rb | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/jobs/api_entreprise/job.rb b/app/jobs/api_entreprise/job.rb index 45d21b1ad..7853100ce 100644 --- a/app/jobs/api_entreprise/job.rb +++ b/app/jobs/api_entreprise/job.rb @@ -1,5 +1,14 @@ class ApiEntreprise::Job < ApplicationJob DEFAULT_MAX_ATTEMPTS_API_ENTREPRISE_JOBS = 5 + + rescue_from(ApiEntreprise::API::ResourceNotFound) do |exception| + error(self, exception) + end + + rescue_from(ApiEntreprise::API::BadFormatRequest) do |exception| + error(self, exception) + end + def max_attempts ENV[MAX_ATTEMPTS_API_ENTREPRISE_JOBS].to_i || DEFAULT_MAX_ATTEMPTS_API_ENTREPRISE_JOBS end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb index 767b53f1a..b914d7bd9 100644 --- a/app/jobs/application_job.rb +++ b/app/jobs/application_job.rb @@ -9,10 +9,6 @@ class ApplicationJob < ActiveJob::Base Rails.logger.info("#{job.class.name} ended at #{Time.zone.now}") end - rescue_from(ApiEntreprise::API::ResourceNotFound) do |exception| - error(self, exception) - end - def error(job, exception) Raven.capture_exception(exception) end