Only rescue certain errors when reindexing - #802

Andrew Kane
1 parent 64e35004
Showing 5 changed files with 22 additions and 2 deletions Show diff stats
Gemfile
lib/searchkick/reindex_v2_job.rb
test/gemfiles/mongoid6.gemfile
test/gemfiles/nobrainer.gemfile
test/test_helper.rb
@@ -7,3 +7,4 @@ gem &quot;sqlite3&quot;
 gem "activerecord", "~> 5.0.0"
 gem "gemoji-parser"
 gem "typhoeus"
+gem "activejob"
 module Searchkick
   class ReindexV2Job < ActiveJob::Base
+    RECORD_NOT_FOUND_CLASSES = [
+      "ActiveRecord::RecordNotFound",
+      "Mongoid::Errors::DocumentNotFound",
+      "NoBrainer::Error::DocumentNotFound"
+    ]
+
     queue_as :searchkick
  
     def perform(klass, id)
       model = klass.constantize
-      record = model.find(id) rescue nil # TODO fix lazy coding
+      record =
+        begin
+          model.find(id)
+        rescue => e
+          raise e unless RECORD_NOT_FOUND_CLASSES.include?(e.class.name)
+          nil
+        end
+
       index = model.searchkick_index
       if !record || !record.should_index?
         # hacky
@@ -4,3 +4,4 @@ source &#39;https://rubygems.org&#39;
 gemspec path: "../../"
  
 gem "mongoid", "~> 6.0.0"
+gem "activejob"
@@ -4,3 +4,4 @@ source &#39;https://rubygems.org&#39;
 gemspec path: "../../"
  
 gem "nobrainer", ">= 0.21.0"
+gem "activejob"
@@ -18,7 +18,11 @@ puts &quot;Running against Elasticsearch #{Searchkick.server_version}&quot;
  
 I18n.config.enforce_available_locales = true
  
-ActiveJob::Base.logger = nil if defined?(ActiveJob)
+if defined?(ActiveJob)
+  ActiveJob::Base.logger = nil
+  ActiveJob::Base.queue_adapter = :inline
+end
+
 ActiveSupport::LogSubscriber.logger = Logger.new(STDOUT) if ENV["NOTIFICATIONS"]
  
 def elasticsearch_below50?
...	...	@@ -7,3 +7,4 @@ gem "sqlite3"
7	7	gem "activerecord", "~> 5.0.0"
8	8	gem "gemoji-parser"
9	9	gem "typhoeus"
	10	+gem "activejob"
...	...
1	1	module Searchkick
2	2	class ReindexV2Job < ActiveJob::Base
	3	+ RECORD_NOT_FOUND_CLASSES = [
	4	+ "ActiveRecord::RecordNotFound",
	5	+ "Mongoid::Errors::DocumentNotFound",
	6	+ "NoBrainer::Error::DocumentNotFound"
	7	+ ]
	8	+
3	9	queue_as :searchkick
4	10
5	11	def perform(klass, id)
6	12	model = klass.constantize
7		- record = model.find(id) rescue nil # TODO fix lazy coding
	13	+ record =
	14	+ begin
	15	+ model.find(id)
	16	+ rescue => e
	17	+ raise e unless RECORD_NOT_FOUND_CLASSES.include?(e.class.name)
	18	+ nil
	19	+ end
	20	+
8	21	index = model.searchkick_index
9	22	if !record \|\| !record.should_index?
10	23	# hacky
...	...
...	...	@@ -4,3 +4,4 @@ source 'https://rubygems.org'
4	4	gemspec path: "../../"
5	5
6	6	gem "mongoid", "~> 6.0.0"
	7	+gem "activejob"
...	...
...	...	@@ -4,3 +4,4 @@ source 'https://rubygems.org'
4	4	gemspec path: "../../"
5	5
6	6	gem "nobrainer", ">= 0.21.0"
	7	+gem "activejob"
...	...
...	...	@@ -18,7 +18,11 @@ puts "Running against Elasticsearch #{Searchkick.server_version}"
18	18
19	19	I18n.config.enforce_available_locales = true
20	20
21		-ActiveJob::Base.logger = nil if defined?(ActiveJob)
	21	+if defined?(ActiveJob)
	22	+ ActiveJob::Base.logger = nil
	23	+ ActiveJob::Base.queue_adapter = :inline
	24	+end
	25	+
22	26	ActiveSupport::LogSubscriber.logger = Logger.new(STDOUT) if ENV["NOTIFICATIONS"]
23	27
24	28	def elasticsearch_below50?
...	...