0
@@ -347,14 +347,10 @@ module Ultrasphinx
0
       
0
       def perform_action_with_retries
0
         tries = 0
0
+        exceptions = [NoMethodError, Riddle::VersionError, Riddle::ResponseError, Errno::ECONNREFUSED, Errno::ECONNRESET,  Errno::EPIPE]
0
         begin
0
           yield
0
-        rescue NoMethodError,
0
-            Riddle::VersionError,
0
-            Riddle::ResponseError,
0
-            Errno::ECONNREFUSED, 
0
-            Errno::ECONNRESET, 
0
-            Errno::EPIPE => e
0
+        rescue *exceptions => e
0
           tries += 1
0
           if tries <= Ultrasphinx::Search.client_options['max_retries']
0
             say "restarting query (#{tries} attempts already) (#{e})"            
0
@@ -362,7 +358,9 @@ module Ultrasphinx
0
             retry
0
           else
0
             say "query failed"
0
-            raise DaemonError, e.to_s
0
+            # Clear the rescue list, retry one last time, and let the error fail up the stack
0
+            exceptions = []
0
+            retry
0
           end
0
         end
0
       end