Apply @ulferts feedback

opf · May 21, 2024 · e24081a · e24081a
1 parent abcd5e2
commit e24081a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/app/workers/mails/reminder_job.rb b/app/workers/mails/reminder_job.rb
@@ -28,6 +28,9 @@
 
 class Mails::ReminderJob < Mails::DeliverJob
   include ::Notifications::WithMarkedNotifications
+  include GoodJob::ActiveJobExtensions::Concurrency
+
+  good_job_control_concurrency_with total_limit: 1
 
   private
 

diff --git a/app/workers/notifications/create_date_alerts_notifications_job.rb b/app/workers/notifications/create_date_alerts_notifications_job.rb
@@ -30,14 +30,7 @@ module Notifications
   class CreateDateAlertsNotificationsJob < ApplicationJob
     include GoodJob::ActiveJobExtensions::Concurrency
 
-    good_job_control_concurrency_with(
-      enqueue_limit: 1,
-      perform_limit: 1
-    )
-
-    retry_on GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError,
-             wait: 5.minutes,
-             attempts: 3
+    good_job_control_concurrency_with total_limit: 1
 
     def perform(user)
       return unless EnterpriseToken.allows_to?(:date_alerts)

diff --git a/app/workers/work_packages/apply_working_days_change_job.rb b/app/workers/work_packages/apply_working_days_change_job.rb
@@ -34,10 +34,6 @@ class WorkPackages::ApplyWorkingDaysChangeJob < ApplicationJob
     total_limit: 1
   )
 
-  retry_on GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError,
-           wait: 5.minutes,
-           attempts: 3
-
   def perform(user_id:, previous_working_days:, previous_non_working_days:)
     user = User.find(user_id)
 

diff --git a/app/workers/work_packages/progress/job.rb b/app/workers/work_packages/progress/job.rb
@@ -42,5 +42,5 @@ class WorkPackages::Progress::Job < ApplicationJob
 
   retry_on GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError,
            wait: 5.minutes,
-           attempts: 3
+           attempts: :unlimited
 end