diff options
| author | Tom Gilbert <tom@linuxbrit.co.uk> | 2005-08-03 08:30:11 +0000 |
|---|---|---|
| committer | Tom Gilbert <tom@linuxbrit.co.uk> | 2005-08-03 08:30:11 +0000 |
| commit | 55f4e1bc913137ca8c4012525c1a29b56885dd64 (patch) | |
| tree | a399b004ce02c460bb1925c786a8f20e77291b33 /lib/rbot | |
| parent | d8f47b0899f9ba055735250e91ac861e8adde447 (diff) | |
This change they made around TimeoutErrors really pees me off...
Diffstat (limited to 'lib/rbot')
| -rw-r--r-- | lib/rbot/plugins.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbot/plugins.rb b/lib/rbot/plugins.rb index ba01aa7d..e525ebfc 100644 --- a/lib/rbot/plugins.rb +++ b/lib/rbot/plugins.rb @@ -190,7 +190,7 @@ module Plugins plugin_string = IO.readlines(@tmpfilename).join("") debug "loading module: #{@tmpfilename}" plugin_module.module_eval(plugin_string) - rescue StandardError, NameError, LoadError, SyntaxError => err + rescue TimeoutError, StandardError, NameError, LoadError, SyntaxError => err puts "warning: plugin #{@tmpfilename} load failed: " + err puts err.backtrace.join("\n") end @@ -240,7 +240,7 @@ module Plugins if(@@plugins.has_key?(key)) begin return @@plugins[key].help(key, params) - rescue StandardError, NameError, SyntaxError => err + rescue TimeoutError, StandardError, NameError, SyntaxError => err puts "plugin #{@@plugins[key].name} help() failed: " + err puts err.backtrace.join("\n") end @@ -257,7 +257,7 @@ module Plugins if(p.respond_to? method) begin p.send method, *args - rescue StandardError, NameError, SyntaxError => err + rescue TimeoutError, StandardError, NameError, SyntaxError => err puts "plugin #{p.name} #{method}() failed: " + err puts err.backtrace.join("\n") end @@ -274,7 +274,7 @@ module Plugins @@bot.auth.allow?(m.plugin, m.source, m.replyto)) begin @@plugins[m.plugin].privmsg(m) - rescue StandardError, NameError, SyntaxError => err + rescue TimeoutError, StandardError, NameError, SyntaxError => err puts "plugin #{@@plugins[m.plugin].name} privmsg() failed: " + err puts err.backtrace.join("\n") end |