@@ -100,7 +100,7 @@ module ThinkingSphinx file_path ||= "#{self.config_file}" database_confs = YAML::load(ERB.new(IO.read("#{app_root}/config/database.yml")).result) database_confs.symbolize_keys! - database_conf = database_confs[environment.to_sym] + database_conf = database_confs[db_config_name.to_sym] database_conf.symbolize_keys! open(file_path, "w") do |file| lib/thinking_sphinx/configuration.rb @@ -1,11 +1,11 @@ require 'fileutils' -@indexer = `which indexer`.strip -@searchd = `which searchd`.strip namespace :thinking_sphinx do task :app_env do Rake::Task[:environment].invoke if defined?(RAILS_ROOT) Rake::Task[:merb_init].invoke if defined?(Merb) + @indexer = (`which indexer` rescue '/usr/local/bin/indexer').strip + @searchd = (`which searchd` rescue '/usr/local/bin/searchd').strip end desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings" tasks/thinking_sphinx_tasks.rb 5346590016cc8130a95974e5c0ba9f9604aeb34b Ed Hickey ed@ed-new-laptop.local http://github.com/bassnode/thinking-sphinx/commit/c211adc2bc23c163ccd927a699b5a986d40523a4 c211adc2bc23c163ccd927a699b5a986d40523a4 2008-11-06T06:55:29-08:00 2008-11-06T06:55:29-08:00 propagated dynamic db_config_name in configuration.rb safer indexer and searchd binary locators in rake tasks e7ab0b7736edf8ccbe5dbb5c5e77f2a31103bf55 Ed Hickey ed@ed-new-laptop.local