Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/workers/packages/composer')
-rw-r--r--app/workers/packages/composer/cache_cleanup_worker.rb5
-rw-r--r--app/workers/packages/composer/cache_update_worker.rb5
2 files changed, 8 insertions, 2 deletions
diff --git a/app/workers/packages/composer/cache_cleanup_worker.rb b/app/workers/packages/composer/cache_cleanup_worker.rb
index 638e50e18c4..1d47ef87962 100644
--- a/app/workers/packages/composer/cache_cleanup_worker.rb
+++ b/app/workers/packages/composer/cache_cleanup_worker.rb
@@ -4,9 +4,12 @@ module Packages
module Composer
class CacheCleanupWorker
include ApplicationWorker
+
+ sidekiq_options retry: 3
include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
feature_category :package_registry
+ tags :exclude_from_kubernetes
idempotent!
@@ -22,7 +25,7 @@ module Packages
rescue ActiveRecord::RecordNotFound
# ignore. likely due to object already being deleted.
end
- rescue => e
+ rescue StandardError => e
Gitlab::ErrorTracking.log_exception(e)
end
end
diff --git a/app/workers/packages/composer/cache_update_worker.rb b/app/workers/packages/composer/cache_update_worker.rb
index 664fb23284f..d87abf2e256 100644
--- a/app/workers/packages/composer/cache_update_worker.rb
+++ b/app/workers/packages/composer/cache_update_worker.rb
@@ -5,7 +5,10 @@ module Packages
class CacheUpdateWorker
include ApplicationWorker
+ sidekiq_options retry: 3
+
feature_category :package_registry
+ tags :exclude_from_kubernetes
idempotent!
@@ -15,7 +18,7 @@ module Packages
return unless project
Gitlab::Composer::Cache.new(project: project, name: package_name, last_page_sha: last_page_sha).execute
- rescue => e
+ rescue StandardError => e
Gitlab::ErrorTracking.log_exception(e, project_id: project_id)
end
end