diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-11 21:20:51 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-11 21:20:51 +0000 |
commit | ea9b6997cc8bcb70ea82cb0535d1a4b5a5fd5508 (patch) | |
tree | 653d33c610a24bf88158e7cc899e3b366a8a46d1 /lib/net/protocol.rb | |
parent | 8c5c5a221f3bd3b0bdf6304b924630c35c7f8631 (diff) | |
download | ruby-ea9b6997cc8bcb70ea82cb0535d1a4b5a5fd5508.tar.gz |
* lib/net/protocol.rb (module Net): Added ReadTimeout to match
OpenTimeout. ReadTimeout is now raised by rbuf_fill instead of
Timeout::Error to help users distinguish what type of timeout
occurred. [ruby-trunk - Feature #6088]
* lib/net/pop.rb (module Net): Updated documentation for ReadTimeout
and OpenTimeout.
* lib/net/http.rb (module Net): ditto
* lib/net/smtp.rb (module Net): ditto
* lib/net/telnet.rb (module Net): Net::ReadTimeout is now raised in
waitfor to match Net::Protocol.
* test/net/http/test_http.rb: Updated Timeout::Error expectation to
Net::ReadTimeout.
* test/net/ftp/test_ftp.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net/protocol.rb')
-rw-r--r-- | lib/net/protocol.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 0a54536407..9733d56c93 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -44,8 +44,19 @@ module Net # :nodoc: class ProtoCommandError < ProtocolError; end class ProtoRetriableError < ProtocolError; end ProtocRetryError = ProtoRetriableError + + ## + # OpenTimeout, a subclass of Timeout::Error, is raised if a connection cannot + # be created within the open_timeout. + class OpenTimeout < Timeout::Error; end + ## + # ReadTimeout, a subclass of Timeout::Error, is raised if a chunk of the + # response cannot be read within the read_timeout. + + class ReadTimeout < Timeout::Error; end + class BufferedIO #:nodoc: internal use only def initialize(io) @@ -144,7 +155,7 @@ module Net # :nodoc: if IO.select([@io], nil, nil, @read_timeout) retry else - raise Timeout::Error + raise Net::ReadTimeout end rescue IO::WaitWritable # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable. @@ -152,7 +163,7 @@ module Net # :nodoc: if IO.select(nil, [@io], nil, @read_timeout) retry else - raise Timeout::Error + raise Net::ReadTimeout end end end |