aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
authorGaurish Sharma <contact@gaurishsharma.com>2012-11-20 16:18:28 +0530
committerGaurish Sharma <contact@gaurishsharma.com>2012-11-20 17:04:47 +0530
commit61425f2c6d14fe7151b09ffe5a5353924582e5b0 (patch)
tree46814a61c60b9f90822728b6628a82eeb148aece /railties/lib/rails/application/configuration.rb
parent03ef833b804fe17ff834ac957a300d45bbb24fab (diff)
downloadrails-61425f2c6d14fe7151b09ffe5a5353924582e5b0.tar.gz
rails-61425f2c6d14fe7151b09ffe5a5353924582e5b0.tar.bz2
rails-61425f2c6d14fe7151b09ffe5a5353924582e5b0.zip
Better Error handling when parsing database.yaml
Provides a better error message incase the database.yaml has some errors.
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index f97e66985c..89afeaeec5 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -105,6 +105,10 @@ module Rails
def database_configuration
require 'erb'
YAML.load ERB.new(IO.read(paths["config/database"].first)).result
+ rescue Psych::SyntaxError => e
+ raise "YAML syntax error occurred while parsing #{paths["config/database"].first}. " \
+ "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
+ "Error: #{e.message}"
end
def log_level