@@ -70,10 +70,9 @@ module EventMachine c.comm_inactivity_timeout = options[:timeout] c.pending_connect_timeout = options[:timeout] } - rescue RuntimeError => e - raise e unless e.message == "no connection" + rescue EventMachine::ConnectionError => e conn = EventMachine::HttpClient.new("") - conn.on_error("no connection", true) + conn.on_error(e.message, true) conn end end lib/em-http/request.rb @@ -11,7 +11,7 @@ describe EventMachine::MultiRequest do # add multiple requests to the multi-handler multi.add(EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get(:query => {:q => 'test'})) - multi.add(EventMachine::HttpRequest.new('http://0.0.0.0/').get(:timeout => 1)) + multi.add(EventMachine::HttpRequest.new('http://0.0.0.0:8081/').get(:timeout => 1)) multi.callback { # verify successfull request test/test_multi.rb @@ -26,7 +26,7 @@ describe EventMachine::HttpRequest do http.callback { failed } http.errback { http.response_header.status.should == 0 - http.errors.should match(/no connection/) + http.errors.should match(/unable to resolve server address/) EventMachine.stop } } test/test_request.rb 9268ba468f2e9798c5c2684c9a7a1ec69f83abe4 Ilya Grigorik ilya@igvita.com http://github.com/igrigorik/em-http-request/commit/35dbd42562443bba35138557b932ff6abc46abb7 35dbd42562443bba35138557b932ff6abc46abb7 2009-11-07T15:20:16-08:00 2009-11-07T15:20:16-08:00 use new exception classes (eventmachine > 0.12.10) to handle bad connections b809aded63298738a3055f77fd008b4dd44b4f58 Ilya Grigorik ilya@igvita.com