sunspot 1.3.3 → 2.0.0.pre.111215

data/lib/sunspot/session_proxy/retry_5xx_session_proxy.rb

@@ -1,67 +0,0 @@
-require File.join(File.dirname(__FILE__), 'abstract_session_proxy')
-
-module Sunspot
-  module SessionProxy
-    class Retry5xxSessionProxy < AbstractSessionProxy
-
-      class RetryHandler
-        attr_reader :search_session
-
-        def initialize(search_session)
-          @search_session = search_session
-        end
-
-        def method_missing(m, *args, &block)
-          retry_count = 1
-          begin
-            search_session.send(m, *args, &block)
-          rescue Errno::ECONNRESET => e
-            if retry_count > 0
-              $stderr.puts "Error - #{e.message[/^.*$/]} - retrying..."
-              retry_count -= 1
-              retry
-            else
-              $stderr.puts "Error - #{e.message[/^.*$/]} - ignoring..."
-            end
-          rescue RSolr::Error::Http => e
-            if (500..599).include?(e.response[:status].to_i)
-              if retry_count > 0
-                $stderr.puts "Error - #{e.message[/^.*$/]} - retrying..."
-                retry_count -= 1
-                retry
-              else
-                $stderr.puts "Error - #{e.message[/^.*$/]} - ignoring..."
-                e.response
-              end
-            else
-              raise e
-            end
-          end
-        end
-      end
-
-      attr_reader :search_session
-      attr_reader :retry_handler
-
-      delegate :new_search, :search, :config,
-                :new_more_like_this, :more_like_this,
-                :delete_dirty, :delete_dirty?,
-                :to => :search_session
-
-      def initialize(search_session = Sunspot.session)
-        @search_session = search_session
-        @retry_handler = RetryHandler.new(search_session)
-      end
-
-      def rescued_exception(method, e)
-        $stderr.puts("Exception in #{method}: #{e.message}")
-      end
-
-      delegate :batch, :commit, :commit_if_dirty, :commit_if_delete_dirty,
-        :dirty?, :index!, :index, :optimize, :remove!, :remove, :remove_all!,
-        :remove_all, :remove_by_id!, :remove_by_id,
-        :to => :retry_handler
-
-    end
-  end
-end

data/spec/api/session_proxy/retry_5xx_session_proxy_spec.rb

@@ -1,73 +0,0 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
-
-describe Sunspot::SessionProxy::Retry5xxSessionProxy do
-  
-  before :each do
-    Sunspot::Session.connection_class = Mock::ConnectionFactory.new
-    @sunspot_session = Sunspot.session
-    @proxy = Sunspot::SessionProxy::Retry5xxSessionProxy.new(@sunspot_session)
-    Sunspot.session = @proxy
-  end
-
-  class FakeRSolrErrorHttp < RSolr::Error::Http
-    def backtrace
-      []
-    end
-  end
-
-  let :fake_rsolr_request do
-    {:uri => 'http://solr.test/uri'}
-  end
-
-  def fake_rsolr_response(status)
-    {:status => status.to_s}
-  end
-
-  let :post do
-    Post.new(:title => 'test')
-  end
-
-  it "should behave normally without a stubbed exception" do
-    @sunspot_session.should_receive(:index).and_return(mock)
-    Sunspot.index(post)
-  end
-
-  it "should be successful with a single exception followed by a sucess" do
-    e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_rsolr_response(503))
-    @sunspot_session.should_receive(:index).and_return do
-      @sunspot_session.should_receive(:index).and_return(mock)
-      raise e
-    end
-    Sunspot.index(post)
-  end
-
-  it "should return the error response after two exceptions" do
-    fake_response = fake_rsolr_response(503)
-    e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_response)
-    fake_success = mock('success')
-
-    @sunspot_session.should_receive(:index).and_return do
-      @sunspot_session.should_receive(:index).and_return do
-        @sunspot_session.stub!(:index).and_return(fake_success)
-        raise e
-      end
-      raise e
-    end
-
-    response = Sunspot.index(post)
-    response.should_not == fake_success
-    response.should == fake_response
-  end
-
-  it "should not retry a 4xx" do
-    e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_rsolr_response(400))
-    @sunspot_session.should_receive(:index).and_raise(e)
-    lambda { Sunspot.index(post) }.should raise_error
-  end
-
-  # TODO: try against more than just Sunspot.index? but that's just testing the
-  # invocation of delegate, so probably not important. -nz 11Apr12
-
-  it_should_behave_like 'session proxy'
-  
-end