summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorTiger <twatson@gitlab.com>2019-04-15 11:09:30 +1000
committerTiger <twatson@gitlab.com>2019-04-15 12:44:00 +1000
commit781cd4a29d89ae2cd24329ca33d59b5d959617d2 (patch)
tree088694553309fae8d72976712defb72060d621f5 /app/services
parent0a99e0220d9371423039f05f700af3675b26624f (diff)
downloadgitlab-ce-781cd4a29d89ae2cd24329ca33d59b5d959617d2.tar.gz
Rescue and log errors raised when preparing builds60480-rescue-build-preparing-errors
https://gitlab.com/gitlab-org/gitlab-ce/issues/60480
Diffstat (limited to 'app/services')
-rw-r--r--app/services/ci/prepare_build_service.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/ci/prepare_build_service.rb b/app/services/ci/prepare_build_service.rb
index 32f11438b79..3722faeb020 100644
--- a/app/services/ci/prepare_build_service.rb
+++ b/app/services/ci/prepare_build_service.rb
@@ -11,9 +11,11 @@ module Ci
def execute
prerequisites.each(&:complete!)
- unless build.enqueue
- build.drop!(:unmet_prerequisites)
- end
+ build.enqueue!
+ rescue => e
+ Gitlab::Sentry.track_acceptable_exception(e, extra: { build_id: build.id })
+
+ build.drop(:unmet_prerequisites)
end
private