better error messages

This commit is contained in:
Ward Wouts 2002-11-03 08:58:48 +00:00
parent aca04979f4
commit 137c459d50

View file

@ -160,7 +160,7 @@ def get_group_info(server)
print "Got error \"#{$!}\" from #{server}\n" print "Got error \"#{$!}\" from #{server}\n"
raise PermError, "#{$!}" raise PermError, "#{$!}"
rescue Errno::EPIPE, Errno::ECONNRESET rescue Errno::EPIPE, Errno::ECONNRESET
print "Caught Errno::EPIPE reading from server #{server} (get_group_info)\n" print "Caught #{$!.type} reading from server #{server} (get_group_info)\n"
print "Error: #{$!}\n" print "Error: #{$!}\n"
reconnect(server) reconnect(server)
retry retry
@ -193,7 +193,7 @@ def get_xhdr(server, range, header)
raise TempError raise TempError
end end
rescue Net::NNTP::RuntimeError rescue Net::NNTP::RuntimeError
print "Caught Net::NNTP::RuntimeError reading from server #{server} (get_xhdr)\n" print "Caught #{$!.type} reading from server #{server} (get_xhdr)\n"
print "Error: #{$!}\n" print "Error: #{$!}\n"
if ( $!.to_s =~ /^503|^400/ ) if ( $!.to_s =~ /^503|^400/ )
reconnect(server) reconnect(server)
@ -203,7 +203,7 @@ def get_xhdr(server, range, header)
print "Won't handdle this... yet :(\n" print "Won't handdle this... yet :(\n"
end end
rescue Errno::EPIPE, Errno::ECONNRESET, EOFError rescue Errno::EPIPE, Errno::ECONNRESET, EOFError
print "Caught #{$!.message} reading from server #{server} (get_xhdr)\n" print "Caught #{$!.type} reading from server #{server} (get_xhdr)\n"
print "Error: #{$!}\n" print "Error: #{$!}\n"
reconnect(server) reconnect(server)
get_group_info(server) get_group_info(server)
@ -264,7 +264,7 @@ def get_body(server, message)
rescue Net::NNTPReplyError rescue Net::NNTPReplyError
a = '' a = ''
a += $! a += $!
print "Caught Net::NNTPReplyError reading article #{message} from #{server} (get_body)\n" print "Caught #{$!.type} reading article #{message} from #{server} (get_body)\n"
print "Error: #{$!}\n" print "Error: #{$!}\n"
if retries == 0 && (a =~ /^503/ || a =~ /^400/) if retries == 0 && (a =~ /^503/ || a =~ /^400/)
reconnect(server) reconnect(server)
@ -274,11 +274,11 @@ def get_body(server, message)
end end
return false return false
rescue EOFError rescue EOFError
print "Caught EOFError reading article #{message} from #{server} (get_body)\n" print "Caught #{$!.type} reading article #{message} from #{server} (get_body)\n"
print "Error: #{$!}\n" print "Error: #{$!}\n"
return false return false
rescue Errno::EPIPE, Errno::ECONNRESET rescue Errno::EPIPE, Errno::ECONNRESET
print "Caught Errno::EPIPE reading from server #{server} (get_body)\n" print "Caught #{$!.type} reading from server #{server} (get_body)\n"
print "Error: #{$!}\n" print "Error: #{$!}\n"
reconnect(server) reconnect(server)
get_group_info(server) get_group_info(server)