From f7ed81c6aa6a7b68312478680e64e65180350adb Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 2 Jun 2004 21:05:08 +0000 Subject: [PATCH] add timeout on reconnect --- trunk/ripnews/news/article.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/trunk/ripnews/news/article.rb b/trunk/ripnews/news/article.rb index f231f1c..2c51f8d 100644 --- a/trunk/ripnews/news/article.rb +++ b/trunk/ripnews/news/article.rb @@ -1,4 +1,4 @@ -# $Dwarf: article.rb,v 1.80 2003/11/12 14:01:43 ward Exp $ +# $Dwarf: article.rb,v 1.81 2004/05/19 09:55:12 ward Exp $ # $Source$ # @@ -66,8 +66,10 @@ def reconnect(server) end begin sleep 3 - @connections[server]["nntp"] = Net::NNTP.new(server) - rescue SocketError, Errno::EINVAL, EOFError, Errno::ETIMEDOUT + timeout(180) do + @connections[server]["nntp"] = Net::NNTP.new(server) + end + rescue SocketError, Errno::EINVAL, EOFError, Errno::ETIMEDOUT, TimeoutError print "Reconnect to #{server} failed: #{$!}\n" del_server(server) raise PermError, "Couldn't connect to #{server}"