1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/net-imap] Set timeout for IDLE responses

Browse Source 
Fixes #14

https://github.com/ruby/net-imap/commit/39d39ff9bb
This commit is contained in:
Shugo Maeda 2021-03-16 14:54:32 +09:00 committed by Hiroshi SHIBATA
parent 674760316c
commit d785c5b8b2
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/net/imap.rb
View File

@ -229,6 +229,9 @@ module Net
# it raises a Net::OpenTimeout exception. The default value is 30 seconds. # it raises a Net::OpenTimeout exception. The default value is 30 seconds.
attr_reader :open_timeout attr_reader :open_timeout
# Seconds to wait until an IDLE response is received.
attr_reader :idle_response_timeout
# The thread to receive exceptions. # The thread to receive exceptions.
attr_accessor :client_thread attr_accessor :client_thread
@ -1056,7 +1059,7 @@ module Net
unless @receiver_thread_terminating unless @receiver_thread_terminating
remove_response_handler(response_handler) remove_response_handler(response_handler)
put_string("DONE#{CRLF}") put_string("DONE#{CRLF}")
response = get_tagged_response(tag, "IDLE") response = get_tagged_response(tag, "IDLE", @idle_response_timeout)
end end
end end
end end
@ -1142,6 +1145,7 @@ module Net
# If +options[:ssl]+ is a hash, it's passed to # If +options[:ssl]+ is a hash, it's passed to
# OpenSSL::SSL::SSLContext#set_params as parameters. # OpenSSL::SSL::SSLContext#set_params as parameters.
# open_timeout:: Seconds to wait until a connection is opened # open_timeout:: Seconds to wait until a connection is opened
# idle_response_timeout:: Seconds to wait until an IDLE response is received
# #
# The most common errors are: # The most common errors are:
# #
@ -1171,6 +1175,7 @@ module Net
@tag_prefix = "RUBY" @tag_prefix = "RUBY"
@tagno = 0 @tagno = 0
@open_timeout = options[:open_timeout] || 30 @open_timeout = options[:open_timeout] || 30
@idle_response_timeout = options[:idle_response_timeout] || 5
@parser = ResponseParser.new @parser = ResponseParser.new
@sock = tcp_socket(@host, @port) @sock = tcp_socket(@host, @port)
begin begin
@ -1294,10 +1299,19 @@ module Net
end end
end end
def get_tagged_response(tag, cmd) def get_tagged_response(tag, cmd, timeout = nil)
if timeout
deadline = Time.now + timeout
end
until @tagged_responses.key?(tag) until @tagged_responses.key?(tag)
raise @exception if @exception raise @exception if @exception
@tagged_response_arrival.wait if timeout
timeout = deadline - Time.now
if timeout <= 0
return nil
end
end
@tagged_response_arrival.wait(timeout)
end end
resp = @tagged_responses.delete(tag) resp = @tagged_responses.delete(tag)
case resp.name case resp.name