To edit pages or tickets please login with username/password: aaf/aaf

Changeset 311

Show
Ignore:
Timestamp:
02/02/08 20:49:15 (8 months ago)
Author:
jk
Message:

#191 - raise error when environment.rb is not found on DRb startup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/plugin/acts_as_ferret/lib/server_manager.rb

    r294 r311  
    4141  ENV['FERRET_USE_LOCAL_INDEX'] = 'true' 
    4242  ENV['RAILS_ENV'] = $ferret_server_options['environment'] 
    43   #require(File.join(File.dirname(__FILE__), '../../../../config/environment')) 
    44   if $ferret_server_options['root'] 
    45     require File.join($ferret_server_options['root'], 'config', 'environment') 
    46   else 
    47     require(File.join(File.dirname(ENV['_']), '../config/environment')) 
    48   end 
     43   
     44  # determine RAILS_ROOT unless already set 
     45  RAILS_ROOT = $ferret_server_options['root'] || File.join(File.dirname(__FILE__), *(['..']*4)) unless defined? RAILS_ROOT 
     46  # check if environment.rb is present 
     47  rails_env_file = File.join(RAILS_ROOT, 'config', 'environment') 
     48  raise "Unable to find Rails environment.rb at \n#{rails_env_file}.rb\nPlease use the --root option of ferret_server to point it to your RAILS_ROOT." unless File.exists?(rails_env_file+'.rb') 
     49  # load it 
     50  require rails_env_file 
     51 
    4952  require 'acts_as_ferret' 
    5053  ActsAsFerret::Remote::Server.new.send($ferret_server_action) 

To edit pages or tickets please login with username/password: aaf/aaf