@@ -76,21 +76,25 @@ module ThinkingSphinx def index_delta return true unless ThinkingSphinx.updates_enabled? && ThinkingSphinx.deltas_enabled? - config = ThinkingSphinx::Configuration.new - client = Riddle::Client.new config.address, config.port + begin + config = ThinkingSphinx::Configuration.new + client = Riddle::Client.new config.address, config.port - client.update( - "#{self.class.indexes.first.name}_core", - ['sphinx_deleted'], - {self.id => 1} - ) if self.in_core_index? + client.update( + "#{self.class.indexes.first.name}_core", + ['sphinx_deleted'], + {self.id => 1} + ) if self.in_core_index? - unless ThinkingSphinx.offline_indexing? - configuration = ThinkingSphinx::Configuration.new - system "indexer --config #{configuration.config_file} --rotate #{self.class.indexes.first.name}_delta" + unless ThinkingSphinx.offline_indexing? + configuration = ThinkingSphinx::Configuration.new + system "indexer --config #{configuration.config_file} --rotate #{self.class.indexes.first.name}_delta" + end + rescue Exception => e + ::ActiveRecord::Base.logger.error "#{e.message}: #{e.backtrace.join('\n')}" + ensure + true end - - true end end end lib/thinking_sphinx/active_record/delta.rb @@ -7,6 +7,7 @@ require 'not_a_mock' require 'lib/thinking_sphinx' require 'spec/sphinx_helper' +ActiveRecord::Base.logger = Logger.new(StringIO.new) Spec::Runner.configure do |config| # config.mock_with NotAMock::RspecMockFrameworkAdapter spec/spec_helper.rb @@ -203,6 +203,13 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do @client.should have_received(:update) end + + it "should capture and log silently if exception" do + ThinkingSphinx::Configuration.stub_method_to_raise(:new => RuntimeError.new('arrrrg')) + @person.send(:index_delta).should_not raise_error(RuntimeError) + @person.send(:index_delta).should be_true + end + end describe "index_delta method with offline indexing" do spec/unit/thinking_sphinx/active_record/delta_spec.rb da31042781e6dc4d94d311be624b45adfc8bb879 Ed Hickey ed@ed-new-laptop.local http://github.com/bassnode/thinking-sphinx/commit/b6d51b4c8f6c585eb995438cc162f16aa99dd2d2 b6d51b4c8f6c585eb995438cc162f16aa99dd2d2 2008-09-10T09:27:42-07:00 2008-09-10T09:27:42-07:00 wrap the after filter with a begin block in case Sphinx is offline d0bb2c0c151c49f6e5f80c783351c4c16a5ecb22 Ed Hickey ed@ed-new-laptop.local