diff options
author | Steve Abrams <sabrams@gitlab.com> | 2019-06-19 01:08:30 +0300 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-06-19 01:08:30 +0300 |
commit | 34a283f90a56914306f77384e7b54c2dbd2e467a (patch) | |
tree | 022132b6fa8aa927f0e5ac5cc3b1292ec4efe3f9 /app | |
parent | 6fa900547dbd30b0db0070f87dbeb4b05d485b9b (diff) |
Add 2nd response for container api bulk delete
The bulk delete api endpoint for container registries can
only be called once per hour. If a user calls the endpoint more
than once per hour, they will now receive a 400 error with a
descriptive message.
Diffstat (limited to 'app')
-rw-r--r-- | app/workers/cleanup_container_repository_worker.rb | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/app/workers/cleanup_container_repository_worker.rb b/app/workers/cleanup_container_repository_worker.rb index 974ee8c8146..0331fc7b01c 100644 --- a/app/workers/cleanup_container_repository_worker.rb +++ b/app/workers/cleanup_container_repository_worker.rb @@ -2,12 +2,9 @@ class CleanupContainerRepositoryWorker include ApplicationWorker - include ExclusiveLeaseGuard queue_namespace :container_repository - LEASE_TIMEOUT = 1.hour - attr_reader :container_repository, :current_user def perform(current_user_id, container_repository_id, params) @@ -16,11 +13,9 @@ class CleanupContainerRepositoryWorker return unless valid? - try_obtain_lease do - Projects::ContainerRepository::CleanupTagsService - .new(project, current_user, params) - .execute(container_repository) - end + Projects::ContainerRepository::CleanupTagsService + .new(project, current_user, params) + .execute(container_repository) end private @@ -32,22 +27,4 @@ class CleanupContainerRepositoryWorker def project container_repository&.project end - - # For ExclusiveLeaseGuard concern - def lease_key - @lease_key ||= "container_repository:cleanup_tags:#{container_repository.id}" - end - - # For ExclusiveLeaseGuard concern - def lease_timeout - LEASE_TIMEOUT - end - - # For ExclusiveLeaseGuard concern - def lease_release? - # we don't allow to execute this worker - # more often than LEASE_TIMEOUT - # for given container repository - false - end end |