diff options
Diffstat (limited to 'lib/puppet/rails.rb')
| -rw-r--r-- | lib/puppet/rails.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 532be1e83..714dda80c 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -59,13 +59,13 @@ module Puppet::Rails socket = Puppet[:dbsocket] args[:socket] = socket unless socket.to_s.empty? - + connections = Puppet[:dbconnections].to_i - args[:pool] = connections if connections > 0 + args[:pool] = connections if connections > 0 when "oracle_enhanced": - args[:database] = Puppet[:dbname] unless Puppet[:dbname].to_s.empty? - args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].to_s.empty? - args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].to_s.empty? + args[:database] = Puppet[:dbname] unless Puppet[:dbname].to_s.empty? + args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].to_s.empty? + args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].to_s.empty? connections = Puppet[:dbconnections].to_i args[:pool] = connections if connections > 0 @@ -137,7 +137,7 @@ module Puppet::Rails ActiveRecord::Base.establish_connection(database_arguments()) rescue => detail if Puppet[:trace] - puts detail.backtrace + puts detail.backtrace end raise Puppet::Error, "Could not connect to database: %s" % detail end |