riddle 1.1.0 → 1.2.0

data/README.textile

@@ -81,3 +81,5 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Piotr Sarnacki
 * Tim Preston
 * Amir Yalon
+* Sam Goldstein
+* Matt Todd

data/lib/riddle/client.rb

@@ -115,7 +115,7 @@ module Riddle
       :float_range  => 2  # SPH_FILTER_FLOATRANGE
     }
     
-    attr_accessor :server, :port, :offset, :limit, :max_matches,
+    attr_accessor :servers, :port, :offset, :limit, :max_matches,
       :match_mode, :sort_mode, :sort_by, :weights, :id_range, :filters,
       :group_by, :group_function, :group_clause, :group_distinct, :cut_off,
       :retry_count, :retry_delay, :anchor, :index_weights, :rank_mode,
@@ -134,11 +134,11 @@ module Riddle
     # Can instantiate with a specific server and port - otherwise it assumes
     # defaults of localhost and 3312 respectively. All other settings can be
     # accessed and changed via the attribute accessors.
-    def initialize(server=nil, port=nil)
+    def initialize(servers=nil, port=nil)
       Riddle.version_warning
       
-      @server = server || "localhost"
-      @port   = port   || 9312
+      @servers = (servers || ["localhost"] ).to_a.shuffle
+      @port   = port     || 9312
       @socket = nil
       
       reset
@@ -177,6 +177,17 @@ module Riddle
       @select         = "*"
     end
     
+    # The searchd server to query.  Servers are removed from @server after a
+    # Timeout::Error is hit to allow for fail-over.
+    def server
+      @servers.first
+    end
+
+    # Backwards compatible writer to the @servers array.
+    def server=(server)
+      @servers = server.to_a
+    end
+
     # Set the geo-anchor point - with the names of the attributes that contain
     # the latitude and longitude (in radians), and the reference position.
     # Note that for geocoding to work properly, you must also set
@@ -475,9 +486,18 @@ module Riddle
       else
         begin
           Timeout.timeout(@timeout) { @socket = initialise_connection }
-        rescue Timeout::Error
-          raise Riddle::ConnectionError,
-            "Connection to #{@server} on #{@port} timed out after #{@timeout} seconds"
+        rescue Timeout::Error, Riddle::ConnectionError => e
+          failed_servers ||= []
+          failed_servers << servers.shift
+          retry if !servers.empty?
+
+          case e
+          when Timeout::Error
+            raise Riddle::ConnectionError,
+              "Connection to #{failed_servers.inspect} on #{@port} timed out after #{@timeout} seconds"
+          else
+            raise e
+          end
         end
       end
       
@@ -499,11 +519,13 @@ module Riddle
       if @socket.nil? || @socket.closed?
         @socket = nil
         open_socket
-      end
-      begin
+        begin
+          yield @socket
+        ensure
+          close_socket
+        end
+      else
         yield @socket
-      ensure
-        close_socket
       end
     end
     
@@ -530,15 +552,15 @@ module Riddle
           self.connection.call(self)
         elsif self.class.connection
           self.class.connection.call(self)
-        elsif @server.index('/') == 0
-          UNIXSocket.new @server
+        elsif server.index('/') == 0
+          UNIXSocket.new server
         else
-          TCPSocket.new @server, @port
+          TCPSocket.new server, @port
         end
       rescue Errno::ECONNREFUSED => e
         retry if (tries += 1) < 5
         raise Riddle::ConnectionError,
-          "Connection to #{@server} on #{@port} failed. #{e.message}"
+          "Connection to #{server} on #{@port} failed. #{e.message}"
       end
       
       socket

data/lib/riddle/controller.rb

@@ -46,9 +46,16 @@ module Riddle
     
     def stop
       return true unless running?
-      Process.kill('SIGTERM', pid.to_i)
-    rescue Errno::EINVAL
-      Process.kill('SIGKILL', pid.to_i)
+      
+      stop_flag = 'stopwait'
+      stop_flag = 'stop' if Riddle.loaded_version.split('.').first == '0'
+      cmd = %(#{searchd} --pidfile --config "#{@path}" --#{stop_flag})
+      
+      if RUBY_PLATFORM =~ /mswin/
+        system("start /B #{cmd} 1> NUL 2>&1")
+      else
+        `#{cmd}`
+      end
     ensure
       return !running?
     end

data/spec/sphinx_helper.rb

@@ -34,11 +34,12 @@ class SphinxHelper
     structure = File.open("spec/fixtures/sql/structure.sql") { |f| f.read }
     # Block ensures multiple statement transaction is closed.
     server.query(structure) { |response| }
-    data = File.open("spec/fixtures/sql/data.sql") { |f|
-      while line = f.gets
-        server.query line
-      end
-    }
+    server.query <<-QUERY
+      LOAD DATA LOCAL INFILE '#{@path}/fixtures/sql/data.tsv' INTO TABLE
+      `riddle`.`people` FIELDS TERMINATED BY ',' ENCLOSED BY "'" (gender,
+      first_name, middle_initial, last_name, street_address, city, state,
+      postcode, email, birthday)
+    QUERY
 
     server.close
   end
@@ -90,4 +91,4 @@ class SphinxHelper
   def running?
     pid && `ps #{pid} | wc -l`.to_i > 1
   end
-end
+end

data/spec/unit/client_spec.rb

@@ -222,4 +222,39 @@ describe Riddle::Client do
       }.should raise_error(Riddle::ConnectionError)
     end
   end
+
+  context "connection fail over" do
+    it "should try each of several server addresses after timeouts" do
+      client = Riddle::Client.new
+      client.port    = 3314
+      client.servers = %w[localhost 127.0.0.1 0.0.0.0]
+      client.timeout  = 1
+
+      TCPSocket.should_receive(:new).with(
+        an_instance_of(String), 3314
+      ).exactly(3).and_raise Timeout::Error
+
+      lambda {
+        client.send(:connect) { |socket| }
+      }.should raise_error(Riddle::ConnectionError)
+    end
+
+    it "should try each of several server addresses after a connection refused" do
+      client = Riddle::Client.new
+      client.port    = 3314
+      client.servers = %w[localhost 127.0.0.1 0.0.0.0]
+      client.timeout  = 1
+
+      # initialise_socket will retry 5 times before failing,
+      # these combined with the multiple server failover should result in 15
+      # calls to TCPSocket.new
+      TCPSocket.should_receive(:new).with(
+        an_instance_of(String), 3314
+      ).exactly(3 * 5).and_raise Errno::ECONNREFUSED
+
+      lambda {
+        client.send(:connect) { |socket| }
+      }.should raise_error(Riddle::ConnectionError)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 +09:00
+date: 2010-11-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,8 +116,8 @@ homepage: http://riddle.freelancing-gods.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement