Author: kclark
Date: Sat Mar 7 00:03:15 2009
New Revision: 751142
URL: http://svn.apache.org/viewvc?rev=751142&view=rev
Log:
THRIFT-229. rb: Don't block indefinitely on connect()
Modified:
incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb
incubator/thrift/trunk/lib/rb/spec/socket_spec.rb
Modified: incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb?rev=751142&r1=751141&r2=751142&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb (original)
+++ incubator/thrift/trunk/lib/rb/lib/thrift/transport/socket.rb Sat Mar 7
00:03:15 2009
@@ -23,9 +23,23 @@
def open
begin
- @handle = TCPSocket.new(@host, @port)
- rescue StandardError
- raise TransportException.new(TransportException::NOT_OPEN, "Could not
connect to #...@desc}")
+ addrinfo = ::Socket::getaddrinfo(@host, @port).first
+ @handle = ::Socket.new(addrinfo[4], ::Socket::SOCK_STREAM, 0)
+ sockaddr = ::Socket.sockaddr_in(addrinfo[1], addrinfo[3])
+ begin
+ @handle.connect_nonblock(sockaddr)
+ rescue Errno::EINPROGRESS
+ unless IO.select(nil, [ @handle ], nil, @timeout)
+ raise TransportException.new(TransportException::NOT_OPEN,
"Connection timeout to #...@desc}")
+ end
+ begin
+ @handle.connect_nonblock(sockaddr)
+ rescue Errno::EISCONN
+ end
+ end
+ @handle
+ rescue StandardError => e
+ raise TransportException.new(TransportException::NOT_OPEN, "Could not
connect to #...@desc}: #{e}")
end
end
Modified: incubator/thrift/trunk/lib/rb/spec/socket_spec.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/spec/socket_spec.rb?rev=751142&r1=751141&r2=751142&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/spec/socket_spec.rb (original)
+++ incubator/thrift/trunk/lib/rb/spec/socket_spec.rb Sat Mar 7 00:03:15 2009
@@ -9,28 +9,33 @@
@socket = Socket.new
@handle = mock("Handle", :closed? => false)
@handle.stub!(:close)
- TCPSocket.stub!(:new).and_return(@handle)
+ @handle.stub!(:connect_nonblock)
+ ::Socket.stub!(:new).and_return(@handle)
end
it_should_behave_like "a socket"
it "should raise a TransportException when it cannot open a socket" do
- TCPSocket.should_receive(:new).and_raise(StandardError)
+ ::Socket.should_receive(:new).and_raise(StandardError)
lambda { @socket.open }.should raise_error(Thrift::TransportException) {
|e| e.type.should == Thrift::TransportException::NOT_OPEN }
end
- it "should open a TCPSocket with default args" do
- TCPSocket.should_receive(:new).with('localhost', 9090)
+ it "should open a ::Socket with default args" do
+ ::Socket.should_receive(:new).and_return(mock("Handle",
:connect_nonblock => true))
+ ::Socket.should_receive(:getaddrinfo).with("localhost",
9090).and_return([[]])
+ ::Socket.should_receive(:sockaddr_in)
@socket.open
end
it "should accept host/port options" do
- TCPSocket.should_receive(:new).with('my.domain', 1234)
+ ::Socket.should_receive(:new).and_return(mock("Handle",
:connect_nonblock => true))
+ ::Socket.should_receive(:getaddrinfo).with("my.domain",
1234).and_return([[]])
+ ::Socket.should_receive(:sockaddr_in)
Socket.new('my.domain', 1234).open
end
it "should accept an optional timeout" do
- TCPSocket.stub!(:new)
+ ::Socket.stub!(:new)
Socket.new('localhost', 8080, 5).timeout.should == 5
end
end
