13996: Move configuration load earlier, before database setup

[arvados.git] / services / api / config / arvados_config.rb

diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index 219455e32205a513fe17a57d406e8c95d827a574..835666bddc2c43ce4490f5db5ee4ee1da9bf55e9 100644 (file)
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -205,6 +205,10 @@ if ::Rails.env.to_s == "test"
   $arvados_config["PostgreSQL"]["Connection"]["DBName"] = "arvados_test"
 end
 
+if $arvados_config["PostgreSQL"]["Connection"]["Password"].empty?
+  raise "Database password is empty, PostgreSQL section is: #{$arvados_config["PostgreSQL"]}"
+end
+
 dbhost = $arvados_config["PostgreSQL"]["Connection"]["Host"]
 if $arvados_config["PostgreSQL"]["Connection"]["Post"] != 0
   dbhost += ":#{$arvados_config["PostgreSQL"]["Connection"]["Post"]}"