specify options first

master^2
andrew 2008-12-04 23:00:12 -06:00
parent 394bb364e8
commit 7731234032
1 changed files with 2 additions and 1 deletions

View File

@ -46,8 +46,9 @@ configure do
log.debug "Using #{Sinatra.env} database environment"
db_config = YAML::load_file(File.dirname(__FILE__) + '/config/database.yml')[Sinatra.env]
ActiveRecord::Base.logger = log
ActiveRecord::Base.establish_connection db_config
ActiveRecord::Base.allow_concurrency = true
ActiveRecord::Base.verification_timeout = 300
ActiveRecord::Base.establish_connection db_config
rescue => exception
log.fatal "There was a problem loading the database.yml file:"
exception.backtrace.each do |msg|