diff --git a/app/jobs/send_form_completed_webhook_request_job.rb b/app/jobs/send_form_completed_webhook_request_job.rb index 9213e643..ff098e53 100644 --- a/app/jobs/send_form_completed_webhook_request_job.rb +++ b/app/jobs/send_form_completed_webhook_request_job.rb @@ -3,9 +3,10 @@ class SendFormCompletedWebhookRequestJob < ApplicationJob USER_AGENT = 'DocuSeal.co Webhook' - NotSuccessStatus = Class.new(StandardError) + MAX_ATTEMPTS = 10 - def perform(submitter) + def perform(submitter, params = {}) + attempt = params[:attempt].to_i config = Accounts.load_webhook_configs(submitter.submission.account) return if config.blank? || config.value.blank? @@ -23,8 +24,13 @@ class SendFormCompletedWebhookRequestJob < ApplicationJob 'Content-Type' => 'application/json', 'User-Agent' => USER_AGENT) - if resp.status.to_i >= 400 && (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan)) - raise NotSuccessStatus, resp.status.to_s + if resp.status.to_i >= 400 && attempt <= MAX_ATTEMPTS && + (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan)) + SendFormCompletedWebhookRequestJob.set(wait: (2**attempt).minutes) + .perform_later(submitter, { + attempt: attempt + 1, + last_status: resp.status.to_i + }) end end end diff --git a/app/jobs/send_form_started_webhook_request_job.rb b/app/jobs/send_form_started_webhook_request_job.rb index 1f8fa206..61a992f2 100644 --- a/app/jobs/send_form_started_webhook_request_job.rb +++ b/app/jobs/send_form_started_webhook_request_job.rb @@ -3,9 +3,10 @@ class SendFormStartedWebhookRequestJob < ApplicationJob USER_AGENT = 'DocuSeal.co Webhook' - NotSuccessStatus = Class.new(StandardError) + MAX_ATTEMPTS = 10 - def perform(submitter) + def perform(submitter, params = {}) + attempt = params[:attempt].to_i config = Accounts.load_webhook_configs(submitter.submission.account) return if config.blank? || config.value.blank? @@ -21,8 +22,13 @@ class SendFormStartedWebhookRequestJob < ApplicationJob 'Content-Type' => 'application/json', 'User-Agent' => USER_AGENT) - if resp.status.to_i >= 400 && (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan)) - raise NotSuccessStatus, resp.status.to_s + if resp.status.to_i >= 400 && attempt <= MAX_ATTEMPTS && + (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan)) + SendFormStartedWebhookRequestJob.set(wait: (2**attempt).minutes) + .perform_later(submitter, { + attempt: attempt + 1, + last_status: resp.status.to_i + }) end end end diff --git a/app/jobs/send_form_viewed_webhook_request_job.rb b/app/jobs/send_form_viewed_webhook_request_job.rb index 0ae32e43..25496a94 100644 --- a/app/jobs/send_form_viewed_webhook_request_job.rb +++ b/app/jobs/send_form_viewed_webhook_request_job.rb @@ -3,9 +3,10 @@ class SendFormViewedWebhookRequestJob < ApplicationJob USER_AGENT = 'DocuSeal.co Webhook' - NotSuccessStatus = Class.new(StandardError) + MAX_ATTEMPTS = 10 - def perform(submitter) + def perform(submitter, params = {}) + attempt = params[:attempt].to_i config = Accounts.load_webhook_configs(submitter.submission.account) return if config.blank? || config.value.blank? @@ -21,8 +22,13 @@ class SendFormViewedWebhookRequestJob < ApplicationJob 'Content-Type' => 'application/json', 'User-Agent' => USER_AGENT) - if resp.status.to_i >= 400 && (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan)) - raise NotSuccessStatus, resp.status.to_s + if resp.status.to_i >= 400 && attempt <= MAX_ATTEMPTS && + (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan)) + SendFormViewedWebhookRequestJob.set(wait: (2**attempt).minutes) + .perform_later(submitter, { + attempt: attempt + 1, + last_status: resp.status.to_i + }) end end end