Skip to content

Don't hide errors from EM::HttpRequest #9

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

Merged
jfairbairn merged 2 commits into from
Oct 13, 2016
Merged

Don't hide errors from EM::HttpRequest #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a441a
Don't hide EM::HTTPRequest errors
Oct 12, 2016
5ad830c
fix specs
Oct 12, 2016
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
9 changes: 3 additions & 6 deletions lib/em-net-http.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def request(req, body = nil, &block)
end
f.resume nhres
}
httpreq.errback {|err|f.resume(:error)}
httpreq.errback {|err|f.resume(err)}

nhres = yield_with_error_check(t0)
nhres.instance_variable_set :@httpreq, httpreq
Expand All @@ -185,7 +185,7 @@ def request(req, body = nil, &block)
nhres
else
httpreq.callback &convert_em_http_response
httpreq.errback {|err|f.resume(:error)}
httpreq.errback {|err|f.resume(err)}

yield_with_error_check(t0)
end
Expand All @@ -196,10 +196,7 @@ def request(req, body = nil, &block)
def yield_with_error_check(t0)
res = Fiber.yield

if res == :error
raise 'EM::HttpRequest error - request timed out' if Time.now - self.read_timeout > t0
raise 'EM::HttpRequest error - unknown error'
end
raise res.error if res.class == EM::HttpClient

res
end
Expand Down
5 changes: 5 additions & 0 deletions spec/em-net-http_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
require File.expand_path(File.dirname(__FILE__) + '/spec_helper')

describe "em-net-http" do
around(:each) do |example|
Fiber.new do
example.run
end.resume
end

it 'should support streaming the response' do
assert_identical(:streamed => true) {
Expand Down