From 0c47d351663b9bf0a4d102137feca2e5fa5a8be3 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@chartkick.com>
Date: Tue, 30 Jul 2019 20:35:29 -0700
Subject: [PATCH] Added index_name to ProcessQueueJob

---
 lib/searchkick/model.rb             | 4 ++--
 lib/searchkick/process_batch_job.rb | 4 ++--
 lib/searchkick/process_queue_job.rb | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb
index df8af17..154a75a 100644
--- a/lib/searchkick/model.rb
+++ b/lib/searchkick/model.rb
@@ -45,8 +45,8 @@ module Searchkick
           end
           alias_method Searchkick.search_method_name, :searchkick_search if Searchkick.search_method_name
 
-          def searchkick_index
-            index = class_variable_get(:@@searchkick_index)
+          def searchkick_index(name: nil)
+            index = name || class_variable_get(:@@searchkick_index)
             index = index.call if index.respond_to?(:call)
             index_cache = class_variable_get(:@@searchkick_index_cache)
             index_cache[index] ||= Searchkick::Index.new(index, searchkick_options)
diff --git a/lib/searchkick/process_batch_job.rb b/lib/searchkick/process_batch_job.rb
index 04953b6..b92294b 100644
--- a/lib/searchkick/process_batch_job.rb
+++ b/lib/searchkick/process_batch_job.rb
@@ -2,7 +2,7 @@ module Searchkick
   class ProcessBatchJob < ActiveJob::Base
     queue_as { Searchkick.queue_name }
 
-    def perform(class_name:, record_ids:)
+    def perform(class_name:, record_ids:, index_name: nil)
       # separate routing from id
       routing = Hash[record_ids.map { |r| r.split(/(?<!\|)\|(?!\|)/, 2).map { |v| v.gsub("||", "|") } }]
       record_ids = routing.keys
@@ -26,7 +26,7 @@ module Searchkick
       end
 
       # bulk reindex
-      index = klass.searchkick_index
+      index = klass.searchkick_index(name: index_name)
       Searchkick.callbacks(:bulk) do
         index.bulk_index(records) if records.any?
         index.bulk_delete(delete_records) if delete_records.any?
diff --git a/lib/searchkick/process_queue_job.rb b/lib/searchkick/process_queue_job.rb
index 32161cb..1d66373 100644
--- a/lib/searchkick/process_queue_job.rb
+++ b/lib/searchkick/process_queue_job.rb
@@ -2,16 +2,17 @@ module Searchkick
   class ProcessQueueJob < ActiveJob::Base
     queue_as { Searchkick.queue_name }
 
-    def perform(class_name:, inline: false)
+    def perform(class_name:, index_name: nil, inline: false)
       model = class_name.constantize
       limit = model.searchkick_options[:batch_size] || 1000
 
       loop do
-        record_ids = model.searchkick_index.reindex_queue.reserve(limit: limit)
+        record_ids = model.searchkick_index(name: index_name).reindex_queue.reserve(limit: limit)
         if record_ids.any?
           batch_options = {
             class_name: class_name,
-            record_ids: record_ids
+            record_ids: record_ids,
+            index_name: index_name
           }
 
           if inline
--
libgit2 0.21.0