Changeset 278

Show
Ignore:
Timestamp:
12/15/07 04:03:07 (8 months ago)
Author:
gethema..@gmail.com
Message:

fix error with rails environment loading

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/script/backgroundrb

    r276 r278  
    1717require "yaml" 
    1818require "erb" 
     19require "logger" 
    1920require "master_worker" 
    2021 

  • trunk/server/master_worker.rb

    r276 r278  
    99      @log_mode = log_mode 
    1010      if @log_mode == :foreground 
    11         @logger = Logger.new(STDOUT) 
     11        @logger = ::Logger.new(STDOUT) 
    1212      else 
    13         @logger = Logger.new("#{RAILS_HOME}/log/backgroundrb_debug.log") 
     13        @logger = ::Logger.new("#{RAILS_HOME}/log/backgroundrb_debug.log") 
    1414      end 
    1515    end 
    …… 
    135135 
    136136    def load_rails_env(config_file) 
    137       ActiveRecord::Base.allow_concurrency = true 
    138137      db_config_file = YAML.load(ERB.new(IO.read("#{RAILS_HOME}/config/database.yml")).result) 
    139138      run_env = config_file[:backgroundrb][:environment] || 'development' 
    …… 
    141140      RAILS_ENV.replace(run_env) if defined?(RAILS_ENV) 
    142141      require RAILS_HOME + '/config/environment.rb' 
    143       ActiveRecord::Base.establish_connection(db_config_file[run_env]) 
     142      ActiveRecord::Base.allow_concurrency = true 
    144143    end 
    145144  end