lib/thinking_sphinx/tasks.rb in freelancing-god-thinking-sphinx-1.1.6 vs lib/thinking_sphinx/tasks.rb in freelancing-god-thinking-sphinx-1.1.7

- old
+ new

@@ -6,12 +6,12 @@ Rake::Task[:merb_env].invoke if defined?(Merb) end desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings" task :running_start => :app_env do - Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running? - Rake::Task["thinking_sphinx:start"].invoke + Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running? + Rake::Task["thinking_sphinx:start"].invoke end desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings" task :start => :app_env do config = ThinkingSphinx::Configuration.instance @@ -37,10 +37,10 @@ desc "Stop Sphinx using Thinking Sphinx's settings" task :stop => :app_env do raise RuntimeError, "searchd is not running." unless sphinx_running? config = ThinkingSphinx::Configuration.instance pid = sphinx_pid - system "searchd --stop --config #{config.config_file}" + system "#{config.bin_path}searchd --stop --config #{config.config_file}" puts "Stopped search daemon (pid #{pid})." end desc "Restart Sphinx" task :restart => [:app_env, :stop, :start]