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