Merge branch 'codex/cw-7615-intercom-query-timeout-retries' into codex/cw-7615-intercom-message-batches

2026-07-23 00:29:58 +05:30
parent fcf8972f25 a3fda2a238
commit 1fdf128a74
2 changed files with 25 additions and 3 deletions
@@ -61,10 +61,12 @@ class DataImports::Intercom::Importer
  end

  def fail!(error)
-    return if @data_import.reload.abandoned?
+    @data_import.with_lock do
+      next if @data_import.abandoned? || stale_import_run?

-    record_run_error(error)
-    @data_import.update!(status: :failed, last_error_at: Time.current)
+      record_run_error(error)
+      @data_import.update!(status: :failed, last_error_at: Time.current)
+    end
  end

  def import_contacts_page(starting_after: cursor_for('contacts'))