feat: Add start args for searchd

https://jira.railsc.ru/browse/PC4-19637
abak-press · May 10, 2017 · 46ce6c8 · 46ce6c8
1 parent 86d88bb
commit 46ce6c8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/lib/sphinx/integration/extensions/thinking_sphinx/configuration.rb b/lib/sphinx/integration/extensions/thinking_sphinx/configuration.rb
@@ -4,7 +4,8 @@ module Sphinx::Integration::Extensions::ThinkingSphinx::Configuration
 
   included do
     attr_accessor :remote, :user, :password, :exclude, :ssh_port, :ssh_password,
-                  :log_level, :mysql_read_timeout, :mysql_connect_timeout
+                  :log_level, :mysql_read_timeout, :mysql_connect_timeout,
+                  :start_args
 
     alias_method_chain :shuffled_addresses, :integration
     alias_method_chain :reset, :integration
@@ -43,6 +44,7 @@ def reset_with_integration(custom_app_root = nil)
     self.mysql_connect_timeout = 2
     self.mysql_read_timeout = 5
     self.ssh_port = 22
+    self.start_args = []
     @mysql_client = nil
 
     reset_without_integration(custom_app_root)

diff --git a/lib/sphinx/integration/helper_adapters/local.rb b/lib/sphinx/integration/helper_adapters/local.rb
@@ -13,7 +13,7 @@ def stop
         end
 
         def start
-          searchd
+          searchd(*config.start_args)
         end
 
         def suspend
@@ -61,7 +61,8 @@ def reload
         private
 
         def searchd(*params)
-          logger.info Rye.shell(:searchd, "--config #{config.config_file}", *params).inspect
+          cmd_args = [:searchd, "--config #{config.config_file}"] + params
+          logger.info Rye.shell(*cmd_args).inspect
         end
 
         def indexer(*params)

diff --git a/lib/sphinx/integration/helper_adapters/remote.rb b/lib/sphinx/integration/helper_adapters/remote.rb
@@ -92,7 +92,8 @@ def stop
         end
 
         def start
-          @ssh.execute("searchd", "--config #{config.config_file}")
+          args = ["searchd", "--config #{config.config_file}"] + config.start_args
+          @ssh.execute(*args)
         end
 
         def suspend

diff --git a/spec/sphinx/integration/helper_adapters/local_spec.rb b/spec/sphinx/integration/helper_adapters/local_spec.rb
@@ -17,6 +17,12 @@
       expect(rye).to receive(:shell).with(:searchd, /--config/)
       adapter.start
     end
+
+    it "starts searchd with start_args" do
+      stub_sphinx_conf(start_args: ["--cpustats"])
+      expect(rye).to receive(:shell).with(:searchd, /--config/, "--cpustats")
+      adapter.start
+    end
   end
 
   describe "#remove_indexes" do

diff --git a/spec/sphinx/integration/helper_adapters/remote_spec.rb b/spec/sphinx/integration/helper_adapters/remote_spec.rb
@@ -28,6 +28,12 @@
       expect(ssh).to receive(:execute).with("searchd", /--config/)
       adapter.start
     end
+
+    it "starts searchd with start_args" do
+      stub_sphinx_conf(start_args: ["--cpustats"])
+      expect(ssh).to receive(:execute).with("searchd", /--config/, "--cpustats")
+      adapter.start
+    end
   end
 
   describe "#suspend" do