1 files changed, 4 insertions, 4 deletions
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index 1eb9d12812a..a3172fae027 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -8,11 +8,11 @@ Gitlab.ee do
       config.geo_database = config_for(:database_geo)
     end
   end
-end
 
-Gitlab.ee do
   if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured?
-    Rails.configuration.geo_database['pool'] = Gitlab::Database.default_pool_size
-    Geo::TrackingBase.establish_connection(Rails.configuration.geo_database)
+    # The Geo::TrackingBase model does not yet use connects_to. So,
+    # this will not properly support geo: from config/databse.yml
+    # file yet. This is ACK of the current state and will be fixed.
+    Geo::TrackingBase.establish_connection(Gitlab::Database.geo_db_config_with_default_pool_size)
   end
 end