diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-10 07:11:18 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-10 07:11:18 +0000 |
commit | 5f91caceeae71f29788f4f1bb45903f24458c059 (patch) | |
tree | 1c69eaaf61b04af07a5d50deb21f00721bbeabf4 /lib | |
parent | 2ea54f0c1dbd7a6a28b010d201e63862acc529b5 (diff) | |
download | ruby-5f91caceeae71f29788f4f1bb45903f24458c059.tar.gz |
Net::ReadTimeout and Net::WriteTimeout should tell the cause socket
* lib/net/protocol.rb (ReadTimeout, WriteTimeout): Net::ReadTimeout and Net::WriteTimeout should tell the cause socket
[Feature #14832] [ruby-core:87440]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/protocol.rb | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 71378af804..3610abcacc 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -75,13 +75,39 @@ module Net # :nodoc: # 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 ReadTimeout < Timeout::Error + def initialize(io = nil) + @io = io + end + attr_reader :io + + def message + msg = super + if @io + msg = "#{msg} with #{@io.inspect}" + end + msg + end + end ## # WriteTimeout, a subclass of Timeout::Error, is raised if a chunk of the # response cannot be written within the write_timeout. Not raised on Windows. - class WriteTimeout < Timeout::Error; end + class WriteTimeout < Timeout::Error + def initialize(io = nil) + @io = io + end + attr_reader :io + + def message + msg = super + if @io + msg = "#{msg} with #{@io.inspect}" + end + msg + end + end class BufferedIO #:nodoc: internal use only @@ -188,12 +214,12 @@ module Net # :nodoc: rv.clear return when :wait_readable - @io.to_io.wait_readable(@read_timeout) or raise Net::ReadTimeout + (io = @io.to_io).wait_readable(@read_timeout) or raise Net::ReadTimeout.new(io) # continue looping when :wait_writable # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable. # http://www.openssl.org/support/faq.html#PROG10 - @io.to_io.wait_writable(@read_timeout) or raise Net::ReadTimeout + (io = @io.to_io).wait_writable(@read_timeout) or raise Net::ReadTimeout.new(io) # continue looping when nil raise EOFError, 'end of file reached' @@ -267,7 +293,7 @@ module Net # :nodoc: end # continue looping when :wait_writable - @io.to_io.wait_writable(@write_timeout) or raise Net::WriteTimeout + (io = @io.to_io).wait_writable(@write_timeout) or raise Net::WriteTimeout.new(io) # continue looping end while need_retry end |