Merge #174

174: Add timeout errors to be kept when raise_on_failure is false r=brunoocasali a=brunoocasali

Fixes #172 

Co-authored-by: Bruno Casali <[email protected]>

Author: bors[bot]

lib/meilisearch-rails.rb

@@ -233,9 +233,13 @@ class SafeIndex
       def initialize(index_uid, raise_on_failure, options)
         client = MeiliSearch::Rails.client
         primary_key = options[:primary_key] || MeiliSearch::Rails::IndexSettings::DEFAULT_PRIMARY_KEY
-        client.create_index(index_uid, { primaryKey: primary_key })
-        @index = client.index(index_uid)
         @raise_on_failure = raise_on_failure.nil? || raise_on_failure
+
+        SafeIndex.log_or_throw(nil, @raise_on_failure) do
+          client.create_index(index_uid, { primary_key: primary_key })
+        end
+
+        @index = client.index(index_uid)
       end
 
       ::MeiliSearch::Index.instance_methods(false).each do |m|
@@ -273,7 +277,7 @@ def settings(*args)
 
       def self.log_or_throw(method, raise_on_failure, &block)
         yield
-      rescue ::MeiliSearch::ApiError => e
+      rescue ::MeiliSearch::TimeoutError, ::MeiliSearch::ApiError => e
         raise e if raise_on_failure
 
         # log the error

spec/integration_spec.rb

@@ -1399,6 +1399,8 @@ class SerializedDocument < ActiveRecord::Base
 end
 
 describe 'Raise on failure' do
+  before { Vegetable.instance_variable_set('@ms_indexes', nil) }
+
   it 'raises on failure' do
     expect do
       Fruit.search('', { filter: 'title = Nightshift' })
@@ -1410,6 +1412,33 @@ class SerializedDocument < ActiveRecord::Base
       Vegetable.search('', { filter: 'title = Kale' })
     end.not_to raise_error
   end
+
+  context 'when Meilisearch server take too long to answer' do
+    let(:index_instance) { instance_double(MeiliSearch::Index, settings: nil, update_settings: nil) }
+    let(:slow_client) { instance_double(MeiliSearch::Client, index: index_instance) }
+
+    it 'does not raise error timeouts on reindex' do
+      allow(index_instance).to receive(:add_documents).and_raise(MeiliSearch::TimeoutError)
+      allow(slow_client).to receive(:create_index).and_return(index_instance)
+
+      allow(MeiliSearch::Rails).to receive(:client).and_return(slow_client)
+
+      expect do
+        Vegetable.create(name: 'potato')
+      end.not_to raise_error
+    end
+
+    it 'does not raise error timeouts on data addition' do
+      allow(slow_client).to receive(:create_index).and_raise(MeiliSearch::TimeoutError)
+      allow(index_instance).to receive(:add_documents).and_return(nil)
+
+      allow(MeiliSearch::Rails).to receive(:client).and_return(slow_client)
+
+      expect do
+        Vegetable.ms_reindex!
+      end.not_to raise_error
+    end
+  end
 end
 
 context "when have a internal class defined in the app's scope" do