DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5212 from betagouv/define_max_attempts_for_jobs

Browse source 
define max_attempts for jobs
This commit is contained in:
krichtof 2020-06-03 15:44:23 +02:00 • committed by GitHub
commit 343dbe111c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/jobs/api_entreprise/association_job.rb
View file

@ -1,4 +1,4 @@
class ApiEntreprise::AssociationJob < ApplicationJob class ApiEntreprise::AssociationJob < ApiEntreprise::Job
def perform(etablissement_id, procedure_id) def perform(etablissement_id, procedure_id)
etablissement = Etablissement.find(etablissement_id) etablissement = Etablissement.find(etablissement_id)
etablissement_params = ApiEntreprise::RNAAdapter.new(etablissement.siret, procedure_id).to_params etablissement_params = ApiEntreprise::RNAAdapter.new(etablissement.siret, procedure_id).to_params

2
app/jobs/api_entreprise/attestation_fiscale_job.rb
View file

@ -1,4 +1,4 @@
class ApiEntreprise::AttestationFiscaleJob < ApplicationJob class ApiEntreprise::AttestationFiscaleJob < ApiEntreprise::Job
def perform(etablissement_id, procedure_id, user_id) def perform(etablissement_id, procedure_id, user_id)
etablissement = Etablissement.find(etablissement_id) etablissement = Etablissement.find(etablissement_id)
etablissement_params = ApiEntreprise::AttestationFiscaleAdapter.new(etablissement.siret, procedure_id, user_id).to_params etablissement_params = ApiEntreprise::AttestationFiscaleAdapter.new(etablissement.siret, procedure_id, user_id).to_params

2
app/jobs/api_entreprise/attestation_sociale_job.rb
View file

@ -1,4 +1,4 @@
class ApiEntreprise::AttestationSocialeJob < ApplicationJob class ApiEntreprise::AttestationSocialeJob < ApiEntreprise::Job
def perform(etablissement_id, procedure_id) def perform(etablissement_id, procedure_id)
etablissement = Etablissement.find(etablissement_id) etablissement = Etablissement.find(etablissement_id)
etablissement_params = ApiEntreprise::AttestationSocialeAdapter.new(etablissement.siret, procedure_id).to_params etablissement_params = ApiEntreprise::AttestationSocialeAdapter.new(etablissement.siret, procedure_id).to_params

2
app/jobs/api_entreprise/bilans_bdf_job.rb
View file

@ -1,4 +1,4 @@
class ApiEntreprise::BilansBdfJob < ApplicationJob class ApiEntreprise::BilansBdfJob < ApiEntreprise::Job
def perform(etablissement_id, procedure_id) def perform(etablissement_id, procedure_id)
etablissement = Etablissement.find(etablissement_id) etablissement = Etablissement.find(etablissement_id)
etablissement_params = ApiEntreprise::BilansBdfAdapter.new(etablissement.siret, procedure_id).to_params etablissement_params = ApiEntreprise::BilansBdfAdapter.new(etablissement.siret, procedure_id).to_params

2
app/jobs/api_entreprise/effectifs_annuels_job.rb
View file

@ -1,4 +1,4 @@
class ApiEntreprise::EffectifsAnnuelsJob < ApplicationJob class ApiEntreprise::EffectifsAnnuelsJob < ApiEntreprise::Job
def perform(etablissement_id, procedure_id) def perform(etablissement_id, procedure_id)
etablissement = Etablissement.find(etablissement_id) etablissement = Etablissement.find(etablissement_id)
etablissement_params = ApiEntreprise::EffectifsAnnuelsAdapter.new(etablissement.siret, procedure_id).to_params etablissement_params = ApiEntreprise::EffectifsAnnuelsAdapter.new(etablissement.siret, procedure_id).to_params

2
app/jobs/api_entreprise/effectifs_job.rb
View file

@ -1,4 +1,4 @@
class ApiEntreprise::EffectifsJob < ApplicationJob class ApiEntreprise::EffectifsJob < ApiEntreprise::Job
def perform(etablissement_id, procedure_id) def perform(etablissement_id, procedure_id)
etablissement = Etablissement.find(etablissement_id) etablissement = Etablissement.find(etablissement_id)
etablissement_params = ApiEntreprise::EffectifsAdapter.new(etablissement.siret, procedure_id, *get_current_valid_month_for_effectif).to_params etablissement_params = ApiEntreprise::EffectifsAdapter.new(etablissement.siret, procedure_id, *get_current_valid_month_for_effectif).to_params

2
app/jobs/api_entreprise/entreprise_job.rb
View file

@ -1,4 +1,4 @@
class ApiEntreprise::EntrepriseJob < ApplicationJob class ApiEntreprise::EntrepriseJob < ApiEntreprise::Job
def perform(etablissement_id, procedure_id) def perform(etablissement_id, procedure_id)
etablissement = Etablissement.find(etablissement_id) etablissement = Etablissement.find(etablissement_id)
etablissement_params = ApiEntreprise::EntrepriseAdapter.new(etablissement.siret, procedure_id).to_params etablissement_params = ApiEntreprise::EntrepriseAdapter.new(etablissement.siret, procedure_id).to_params

2
app/jobs/api_entreprise/exercices_job.rb
View file

@ -1,4 +1,4 @@
class ApiEntreprise::ExercicesJob < ApplicationJob class ApiEntreprise::ExercicesJob < ApiEntreprise::Job
def perform(etablissement_id, procedure_id) def perform(etablissement_id, procedure_id)
etablissement = Etablissement.find(etablissement_id) etablissement = Etablissement.find(etablissement_id)
etablissement_params = ApiEntreprise::ExercicesAdapter.new(etablissement.siret, procedure_id).to_params etablissement_params = ApiEntreprise::ExercicesAdapter.new(etablissement.siret, procedure_id).to_params

6
app/jobs/api_entreprise/job.rb Normal file
View file

@ -0,0 +1,6 @@
class ApiEntreprise::Job < ApplicationJob
DEFAULT_MAX_ATTEMPTS_API_ENTREPRISE_JOBS = 5
def max_attempts
ENV[MAX_ATTEMPTS_API_ENTREPRISE_JOBS].to_i || DEFAULT_MAX_ATTEMPTS_API_ENTREPRISE_JOBS
end
end

6
app/jobs/application_job.rb
View file

@ -1,4 +1,6 @@
class ApplicationJob < ActiveJob::Base class ApplicationJob < ActiveJob::Base
DEFAULT_MAX_ATTEMPTS_JOBS = 25
before_perform do |job| before_perform do |job|
Rails.logger.info("#{job.class.name} started at #{Time.zone.now}") Rails.logger.info("#{job.class.name} started at #{Time.zone.now}")
end end
@ -18,4 +20,8 @@ class ApplicationJob < ActiveJob::Base
def error(job, exception) def error(job, exception)
Raven.capture_exception(exception) Raven.capture_exception(exception)
end end
def max_attempts
ENV["MAX_ATTEMPTS_JOBS"].to_i || DEFAULT_MAX_ATTEMPTS_JOBS
end
end end

4
config/env.example
View file

@ -108,3 +108,7 @@ UNIVERSIGN_USERPWD=""
# API Geo / Adresse # API Geo / Adresse
API_ADRESSE_URL="https://api-adresse.data.gouv.fr" API_ADRESSE_URL="https://api-adresse.data.gouv.fr"
API_GEO_URL="https://geo.api.gouv.fr" API_GEO_URL="https://geo.api.gouv.fr"
# Modifier le nb de tentatives de relance de job si echec
# MAX_ATTEMPTS_JOBS=25
# MAX_ATTEMPTS_API_ENTREPRISE_JOBS=5