Wrap geo initializer in `ee` block

fb85fd9d · Robert Speicher · 4bba30ca · fb85fd9d
Commit fb85fd9d authored Jul 08, 2019 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

config/initializers/geo.rb config/initializers/geo.rb +11 -9

No files found.
--- a/config/initializers/geo.rb
+++ b/config/initializers/geo.rb
-if File.exist?(Rails.root.join('config/database_geo.yml'))
+Gitlab.ee do
-  Rails.application.configure do
+  if File.exist?(Rails.root.join('config/database_geo.yml'))
-    config.geo_database = config_for(:database_geo)
+    Rails.application.configure do
+      config.geo_database = config_for(:database_geo)
+    end
  end
-end
-begin
+  begin
-  if Gitlab::Geo.connected? && Gitlab::Geo.primary?
+    if Gitlab::Geo.connected? && Gitlab::Geo.primary?
-    Gitlab::Geo.current_node&.update_clone_url!
+      Gitlab::Geo.current_node&.update_clone_url!
+    end
+  rescue => e
+    warn "WARNING: Unable to check/update clone_url_prefix for Geo: #{e}"
  end
-rescue => e
-  warn "WARNING: Unable to check/update clone_url_prefix for Geo: #{e}"
 end