summaryrefslogtreecommitdiff
path: root/lib/rbot
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2006-08-16 23:18:17 +0000
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2006-08-16 23:18:17 +0000
commit2c204614bd8d2f7c8304f07c09e17a53c9c73b5b (patch)
treecbc94e3a9831226ab99bafadcf6b221a2a191472 /lib/rbot
parent561910cc99d8aa9b8587a90982eed8aaf045f142 (diff)
Some error handling cleanup
Diffstat (limited to 'lib/rbot')
-rw-r--r--lib/rbot/ircbot.rb2
-rw-r--r--lib/rbot/ircsocket.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index 3c2de268..432b61c4 100644
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -606,7 +606,7 @@ class IrcBot
rescue SystemExit
log_session_end
exit 0
- rescue Errno::ETIMEDOUT, TimeoutError, SocketError => e
+ rescue Errno::ETIMEDOUT, Errno::ECONNABORTED, TimeoutError, SocketError => e
error "network exception: #{e.class}: #{e}"
debug e.backtrace.join("\n")
rescue BDB::Fatal => e
diff --git a/lib/rbot/ircsocket.rb b/lib/rbot/ircsocket.rb
index 48a4c2d7..0f724a5c 100644
--- a/lib/rbot/ircsocket.rb
+++ b/lib/rbot/ircsocket.rb
@@ -403,8 +403,8 @@ module Irc
error "Spooling failed: #{e.inspect}"
error e.backtrace.join("\n")
end
- end
end
+ end
def clearq
if @sock
@@ -453,6 +453,7 @@ module Irc
end
rescue => e
error "SEND failed: #{e.inspect}"
+ raise
end
end