lib/sunspot/rails/configuration.rb in pallan-sunspot_rails-0.9.10 vs lib/sunspot/rails/configuration.rb in pallan-sunspot_rails-0.9.12
- old
+ new
@@ -52,11 +52,12 @@
user_configuration['solr']['port']
end || 8983
end
#
- # The URL to call if you are running Solr with multicore. Default '/solr'.
+ # The path to the Solr servlet (useful if you are running multicore).
+ # Default '/solr'.
#
# ==== Returns
#
# String:: path
#
@@ -81,11 +82,10 @@
@user_configuration ||=
begin
path = File.join(::Rails.root, 'config', 'sunspot.yml')
if File.exist?(path)
File.open(path) do |file|
- # only changed this to allow me to test the path attribute
- YAML.load(file)[RAILS_ENV]
+ YAML.load(file)[::Rails.env]
end
end
end
end
end