Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch Hackney errors using '{:error, reason}' tuple format #141

Merged
merged 1 commit into from
May 27, 2016
Merged

Catch Hackney errors using '{:error, reason}' tuple format #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions lib/httpoison/base.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,17 +393,21 @@ defmodule HTTPoison.Base do
def request(module, method, request_url, request_body, request_headers, options, process_status_code, process_headers, process_response_body) do
hn_options = build_hackney_options(module, options)

case :hackney.request(method, request_url, request_headers,
request_body, hn_options) do
{:ok, status_code, headers} -> response(process_status_code, process_headers, process_response_body, status_code, headers, "")
{:ok, status_code, headers, client} ->
case :hackney.body(client) do
{:ok, body} -> response(process_status_code, process_headers, process_response_body, status_code, headers, body)
{:error, reason} -> {:error, %Error{reason: reason} }
end
{:ok, id} -> { :ok, %HTTPoison.AsyncResponse{ id: id } }
{:error, reason} -> {:error, %Error{reason: reason}}
end
try do
case :hackney.request(method, request_url, request_headers,
request_body, hn_options) do
{:ok, status_code, headers} -> response(process_status_code, process_headers, process_response_body, status_code, headers, "")
{:ok, status_code, headers, client} ->
case :hackney.body(client) do
{:ok, body} -> response(process_status_code, process_headers, process_response_body, status_code, headers, body)
{:error, reason} -> {:error, %Error{reason: reason} }
end
{:ok, id} -> { :ok, %HTTPoison.AsyncResponse{ id: id } }
{:error, reason} -> {:error, %Error{reason: reason}}
end
catch
_, reason -> {:error, %Error{reason: reason}}
end
end

defp response(process_status_code, process_headers, process_response_body, status_code, headers, body) do
Expand Down
7 changes: 7 additions & 0 deletions test/httpoison_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,13 @@ defmodule HTTPoisonTest do
end
end

test "send an empty url" do
assert HTTPoison.get "" == {:error, %HTTPoison.Error{reason: :badarg}}
assert_raise HTTPoison.Error, ":badarg", fn ->
HTTPoison.get! ""
end
end

test "asynchronous request" do
{:ok, %HTTPoison.AsyncResponse{id: id}} = HTTPoison.get "localhost:8080/get", [], [stream_to: self]

Expand Down