friendlyfashion-thinking-sphinx 2.0.13.1 → 2.0.13.2

data/lib/thinking_sphinx/search.rb

@@ -423,28 +423,28 @@ module ThinkingSphinx
       retries    = hard_retries
 
       begin
-        retry_on_index_not_preread do
-          retry_on_stale_index do
-            begin
+        retry_on_stale_index do
+          begin
+            retry_on_index_not_preread do
               log query do
                 @results = client.query query, indexes, comment
               end
-              total = @results[:total_found].to_i
-              log "Found #{total} result#{'s' unless total == 1}"
+            end
+            total = @results[:total_found].to_i
+            log "Found #{total} result#{'s' unless total == 1}"
 
-              log "Sphinx Daemon returned warning: #{warning}" if warning?
+            log "Sphinx Daemon returned warning: #{warning}" if warning?
 
-              if error?
-                log "Sphinx Daemon returned error: #{error}"
-                raise SphinxError.new(error, @results) unless options[:ignore_errors]
-              end
-            rescue Errno::ECONNREFUSED => err
-              raise ThinkingSphinx::ConnectionError,
-                'Connection to Sphinx Daemon (searchd) failed.'
+            if error?
+              log "Sphinx Daemon returned error: #{error}"
+              raise SphinxError.new(error, @results) unless options[:ignore_errors]
             end
-
-            compose_results
+          rescue Errno::ECONNREFUSED => err
+            raise ThinkingSphinx::ConnectionError,
+              'Connection to Sphinx Daemon (searchd) failed.'
           end
+
+          compose_results
         end
       rescue => e
         log 'Caught Sphinx exception: %s (%s %s left)' % [

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '2.0.13.1'
+  Version = '2.0.13.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendlyfashion-thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 2.0.13.1
+  version: 2.0.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord