diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-14 21:10:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-14 21:10:34 +0300 |
| commit | 7d4b2ed7bf75d316577b718c71a9fdef19184539 (patch) | |
| tree | d709e00c4f2ab60901749883f324f9069343037c /app/workers/packages | |
| parent | 7172fb10313a9a7790f8e033b347e77df4987154 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/packages')
| -rw-r--r-- | app/workers/packages/nuget/extraction_worker.rb | 3 | ||||
| -rw-r--r-- | app/workers/packages/rubygems/extraction_worker.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/workers/packages/nuget/extraction_worker.rb b/app/workers/packages/nuget/extraction_worker.rb index 97f900c4ff2..4128b229ebe 100644 --- a/app/workers/packages/nuget/extraction_worker.rb +++ b/app/workers/packages/nuget/extraction_worker.rb @@ -17,8 +17,7 @@ module Packages ::Packages::Nuget::UpdatePackageFromMetadataService.new(package_file).execute - rescue ::Packages::Nuget::MetadataExtractionService::ExtractionError, - ::Packages::Nuget::UpdatePackageFromMetadataService::InvalidMetadataError => e + rescue StandardError => e Gitlab::ErrorTracking.log_exception(e, project_id: package_file.project_id) package_file.package.update_column(:status, :error) end diff --git a/app/workers/packages/rubygems/extraction_worker.rb b/app/workers/packages/rubygems/extraction_worker.rb index a5630e89140..fc32654a2c1 100644 --- a/app/workers/packages/rubygems/extraction_worker.rb +++ b/app/workers/packages/rubygems/extraction_worker.rb @@ -19,7 +19,7 @@ module Packages ::Packages::Rubygems::ProcessGemService.new(package_file).execute - rescue ::Packages::Rubygems::ProcessGemService::ExtractionError => e + rescue StandardError => e Gitlab::ErrorTracking.log_exception(e, project_id: package_file.project_id) package_file.package.update_column(:status, :error) end |