Commit 4eb619b0 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'calculate-reactive-cache-with-try-get-for-drone-ci' into 'master'

Use Gitlab::HTTP.try_get to calculate reactive cache for DroneCi

See merge request gitlab-org/gitlab!27878
parents 69a8658c 53242397
...@@ -50,10 +50,12 @@ class DroneCiService < CiService ...@@ -50,10 +50,12 @@ class DroneCiService < CiService
end end
def calculate_reactive_cache(sha, ref) def calculate_reactive_cache(sha, ref)
response = Gitlab::HTTP.get(commit_status_path(sha, ref), verify: enable_ssl_verification) response = Gitlab::HTTP.try_get(commit_status_path(sha, ref),
verify: enable_ssl_verification,
extra_log_info: { project_id: project_id })
status = status =
if response.code == 200 && response['status'] if response && response.code == 200 && response['status']
case response['status'] case response['status']
when 'killed' when 'killed'
:canceled :canceled
...@@ -68,8 +70,6 @@ class DroneCiService < CiService ...@@ -68,8 +70,6 @@ class DroneCiService < CiService
end end
{ commit_status: status } { commit_status: status }
rescue *Gitlab::HTTP::HTTP_ERRORS
{ commit_status: :error }
end end
def build_page(sha, ref) def build_page(sha, ref)
......
...@@ -106,6 +106,10 @@ describe DroneCiService, :use_clean_rails_memory_store_caching do ...@@ -106,6 +106,10 @@ describe DroneCiService, :use_clean_rails_memory_store_caching do
WebMock.stub_request(:get, commit_status_path) WebMock.stub_request(:get, commit_status_path)
.to_raise(http_error) .to_raise(http_error)
expect(Gitlab::ErrorTracking)
.to receive(:log_exception)
.with(instance_of(http_error), project_id: project.id)
is_expected.to eq(:error) is_expected.to eq(:error)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment