Check if database_geo.yml exist before setting the tracking DB config

6beb68fa · Douglas Barbosa Alexandre · 3d0de978 · 6beb68fa
Commit 6beb68fa authored Jun 07, 2017 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

config/initializers/geo.rb config/initializers/geo.rb +2 -1

No files found.
--- a/config/initializers/geo.rb
+++ b/config/initializers/geo.rb
-if Gitlab::Geo.secondary_role_enabled?
+if File.exist?(Rails.root.join('config/database_geo.yml')) &&
+    Gitlab::Geo.secondary_role_enabled?
  Rails.application.configure do
    config.geo_database = config_for(:database_geo)
  end