diff --git a/trunk/ripnews/news/article.rb b/trunk/ripnews/news/article.rb index 348f7be..5ede297 100644 --- a/trunk/ripnews/news/article.rb +++ b/trunk/ripnews/news/article.rb @@ -160,7 +160,7 @@ def get_group_info(server) print "Got error \"#{$!}\" from #{server}\n" raise PermError, "#{$!}" 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" reconnect(server) retry @@ -193,7 +193,7 @@ def get_xhdr(server, range, header) raise TempError end 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" if ( $!.to_s =~ /^503|^400/ ) reconnect(server) @@ -203,7 +203,7 @@ def get_xhdr(server, range, header) print "Won't handdle this... yet :(\n" end 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" reconnect(server) get_group_info(server) @@ -264,7 +264,7 @@ def get_body(server, message) rescue Net::NNTPReplyError 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" if retries == 0 && (a =~ /^503/ || a =~ /^400/) reconnect(server) @@ -274,11 +274,11 @@ def get_body(server, message) end return false 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" return false 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" reconnect(server) get_group_info(server)