lib/gitlab/triage/network_adapters/httparty_adapter.rb in gitlab-triage-1.6.0 vs lib/gitlab/triage/network_adapters/httparty_adapter.rb in gitlab-triage-1.6.1
- old
+ new
@@ -1,9 +1,10 @@
require 'httparty'
require_relative 'base_adapter'
require_relative '../ui'
+require_relative '../errors'
module Gitlab
module Triage
module NetworkAdapters
class HttpartyAdapter < BaseAdapter
@@ -15,10 +16,11 @@
'PRIVATE-TOKEN' => token
}
)
raise_on_unauthorized_error!(response)
+ raise_on_internal_server_error!(response)
{
more_pages: (response.headers["x-next-page"].to_s != ""),
next_page_url: url + "&page=#{response.headers['x-next-page']}",
results: response.parsed_response,
@@ -36,10 +38,11 @@
'PRIVATE-TOKEN' => token
}
)
raise_on_unauthorized_error!(response)
+ raise_on_internal_server_error!(response)
{
results: response.parsed_response,
ratelimit_remaining: response.headers["ratelimit-remaining"].to_i,
ratelimit_reset_at: Time.at(response.headers["ratelimit-reset"].to_i)
@@ -50,10 +53,19 @@
def raise_on_unauthorized_error!(response)
return unless response.response.is_a?(Net::HTTPUnauthorized)
puts Gitlab::Triage::UI.debug response.inspect if options.debug
+
raise 'The provided token is unauthorized!'
+ end
+
+ def raise_on_internal_server_error!(response)
+ return unless response.response.is_a?(Net::HTTPInternalServerError)
+
+ puts Gitlab::Triage::UI.debug response.inspect if options.debug
+
+ raise Errors::Network::InternalServerError, 'Internal server error encountered!'
end
end
end
end
end