Merge branch 'sh-geo-avoid-db-initializer' into 'master'

Avoid using the database in the Geo initializer

See merge request !2099

config/initializers/geo.rb

@@ -6,9 +6,10 @@
 end
 
 begin
-  if Gitlab::Geo.primary?
+  # Avoid using the database if this is run in a Rake task
+  if Gitlab::Geo.primary_role_enabled?
     Gitlab::Geo.current_node.update_clone_url!
   end
-rescue
-  warn 'WARNING: Unable to check/update clone_url_prefix for Geo'
+rescue => e
+  warn "WARNING: Unable to check/update clone_url_prefix for Geo: #{e}"
 end