diff --git a/app/services/geo/base_sync_service.rb b/app/services/geo/base_sync_service.rb index 719038cc23c97979db1390c52ab062b8966bf512..f1d27a2dc3b5786e95f742b47967f255b58f9079 100644 --- a/app/services/geo/base_sync_service.rb +++ b/app/services/geo/base_sync_service.rb @@ -21,6 +21,10 @@ module Geo end end + def lease_key + @lease_key ||= "#{LEASE_KEY_PREFIX}:#{type}:#{project.id}" + end + private def registry @@ -64,10 +68,6 @@ module Geo registry.update!(attrs) end - def lease_key - @lease_key ||= "#{LEASE_KEY_PREFIX}:#{type}:#{project.id}" - end - def type self.class.type end diff --git a/spec/services/geo/repository_sync_service_spec.rb b/spec/services/geo/repository_sync_service_spec.rb index da0df6a0311de9f6f8fe589d219870ecbf6b2702..f1c9e7b8469c77c336430ce755a1919d436b82c0 100644 --- a/spec/services/geo/repository_sync_service_spec.rb +++ b/spec/services/geo/repository_sync_service_spec.rb @@ -8,7 +8,7 @@ RSpec.describe Geo::RepositorySyncService, services: true do before do allow(Gitlab::ExclusiveLease).to receive(:new) - .with(subject.__send__(:lease_key), anything) + .with(subject.lease_key, anything) .and_return(lease) allow_any_instance_of(Repository).to receive(:fetch_geo_mirror) diff --git a/spec/services/geo/wiki_sync_service_spec.rb b/spec/services/geo/wiki_sync_service_spec.rb index a2a5d54c87210048a0fb78c91d4dcdcba48ed2fd..f01cbb2393daf052d950be045a655679c238038f 100644 --- a/spec/services/geo/wiki_sync_service_spec.rb +++ b/spec/services/geo/wiki_sync_service_spec.rb @@ -8,7 +8,7 @@ RSpec.describe Geo::WikiSyncService, services: true do before do allow(Gitlab::ExclusiveLease).to receive(:new) - .with(subject.__send__(:lease_key), anything) + .with(subject.lease_key, anything) .and_return(lease) allow_any_instance_of(Repository).to receive(:fetch_geo_mirror)