use Rails.root

rubish · Jan 7, 2011 · f7e3e47 · f7e3e47
1 parent 7ca65d6
commit f7e3e47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/tasks/escargot.rake b/lib/tasks/escargot.rake
@@ -29,7 +29,7 @@ namespace :escargot do
 
   task :load_all_models do
     models = ActiveRecord::Base.send(:subclasses)
-    Dir["#{RAILS_ROOT}/app/models/*.rb", "#{RAILS_ROOT}/app/models/*/*.rb"].each do |file|
+    Dir["#{Rails.root}/app/models/*.rb", "#{Rails.root}/app/models/*/*.rb"].each do |file|
       model = File.basename(file, ".*").classify
       unless models.include?(model)
         require file

diff --git a/rails/init.rb b/rails/init.rb
@@ -1,4 +1,3 @@
-require 'elasticsearch'
 require 'escargot'
 
 ActiveRecord::Base.class_eval do
@@ -13,7 +12,7 @@
   include Escargot::AdminIndexVersions
 end
 
-unless File.exists?(RAILS_ROOT + "/config/elasticsearch.yml")
+unless File.exists?(Rails.root + "/config/elasticsearch.yml")
   Rails.logger.warn "No config/elastic_search.yaml file found, connecting to localhost:9200"
   $elastic_search_client = ElasticSearch.new("localhost:9200")
 else