Fixed potential problems with logging

Author: smartinventure

.version

@@ -1 +1 @@
-2.3.0.4
+2.3.0.6

VERSION

@@ -1 +1 @@
-2.3.0.4
+2.3.0.6

app/jobs/process_submitter_completion_job.rb

@@ -31,16 +31,41 @@ def perform(params = {})
     enqueue_completed_webhooks(submitter, is_all_completed:)
   end
 
+  MAX_RETRY_ATTEMPTS = 5
+
   def create_completed_submitter!(submitter)
+    retry_attempts ||= 0
     completed_submitter = CompletedSubmitter.find_or_initialize_by(submitter_id: submitter.id)
 
     return completed_submitter if completed_submitter.persisted?
 
-    submission = submitter.submission
+    verification_method, sms_count = extract_verification_data(submitter)
+
+    completed_submitter.assign_attributes(
+      submission_id: submitter.submission_id,
+      account_id: submitter.submission.account_id,
+      is_first: !CompletedSubmitter.exists?(submission: submitter.submission_id, is_first: true),
+      template_id: submitter.submission.template_id,
+      source: submitter.submission.source,
+      sms_count:,
+      verification_method:,
+      completed_at: submitter.completed_at
+    )
 
+    completed_submitter.save!
+    completed_submitter
+  rescue ActiveRecord::RecordNotUnique
+    retry_attempts += 1
+    raise if retry_attempts >= MAX_RETRY_ATTEMPTS
+
+    sleep 0.1 * retry_attempts
+    retry
+  end
+
+  def extract_verification_data(submitter)
     complete_verification_events, sms_events =
       submitter.submission_events.where(event_type: %i[send_sms send_2fa_sms complete_verification complete_kba])
-               .partition { |e| e.event_type == 'complete_verification' || e.event_type == 'complete_kba' }
+               .partition { |e| e.event_type.in?(%w[complete_verification complete_kba]) }
 
     complete_verification_event = complete_verification_events.first
 
@@ -51,22 +76,9 @@ def create_completed_submitter!(submitter)
         complete_verification_event.data['method']
       end
 
-    completed_submitter.assign_attributes(
-      submission_id: submitter.submission_id,
-      account_id: submission.account_id,
-      is_first: !CompletedSubmitter.exists?(submission: submitter.submission_id, is_first: true),
-      template_id: submission.template_id,
-      source: submission.source,
-      sms_count: sms_events.sum { |e| e.data['segments'] || 1 },
-      verification_method:,
-      completed_at: submitter.completed_at
-    )
-
-    completed_submitter.save!
+    sms_count = sms_events.sum { |e| e.data['segments'] || 1 }
 
-    completed_submitter
-  rescue ActiveRecord::RecordNotUnique
-    retry
+    [verification_method, sms_count]
   end
 
   def create_completed_documents!(submitter)

app/jobs/process_submitter_reminders_job.rb

@@ -32,9 +32,13 @@ def self.schedule_interval
   def perform
     Account.active.find_each do |account|
       process_account_reminders(account)
+    rescue StandardError => e
+      # Log error but continue processing other accounts
+      Rails.logger.error("ProcessSubmitterRemindersJob failed for account #{account.id}: #{e.message}")
+      Rollbar.error(e, account_id: account.id) if defined?(Rollbar)
     end
   ensure
-    # Reschedule the job for the next interval
+    # Always reschedule to keep the reminder system running
     self.class.perform_in(self.class.schedule_interval)
   end
 

lib/puma/plugin/sidekiq_embed.rb

@@ -43,7 +43,7 @@ def start_sidekiq!
         config.queues = sidekiq_config['queues']
         config.concurrency = ENV.fetch('SIDEKIQ_THREADS', 5).to_i
         config.merge!(sidekiq_config)
-        config[:max_retries] = 13
+        # Use max_retries from sidekiq.yml (production: 3) - don't override here
 
         ActiveSupport.run_load_hooks(:sidekiq_config, config)
       end.instance_variable_get(:@config)