diff options
Diffstat (limited to 'app/services/container_expiration_policy_service.rb')
-rw-r--r-- | app/services/container_expiration_policy_service.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/services/container_expiration_policy_service.rb b/app/services/container_expiration_policy_service.rb index 80f32298323..cf5d702a9ef 100644 --- a/app/services/container_expiration_policy_service.rb +++ b/app/services/container_expiration_policy_service.rb @@ -4,20 +4,14 @@ class ContainerExpirationPolicyService < BaseService InvalidPolicyError = Class.new(StandardError) def execute(container_expiration_policy) - unless container_expiration_policy.valid? - container_expiration_policy.disable! - raise InvalidPolicyError - end - container_expiration_policy.schedule_next_run! container_expiration_policy.container_repositories.find_each do |container_repository| CleanupContainerRepositoryWorker.perform_async( nil, container_repository.id, - container_expiration_policy.attributes - .except('created_at', 'updated_at') - .merge(container_expiration_policy: true) + container_expiration_policy.policy_params + .merge(container_expiration_policy: true) ) end end |