summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2007-04-08 10:26:50 +0000
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2007-04-08 10:26:50 +0000
commit42045b5df29519cb4307ac433c6fd0d4ba5f157b (patch)
treefa1574926ec78c1eaeef308d0dc5e4824316459e
parent68ec8db1b2a05eb033346bf7c3247a52fa1bf4b6 (diff)
ircbot: do not use debug in sendmsg() because it breaks script. script plugin: handle all Exceptions.
-rw-r--r--data/rbot/plugins/script.rb6
-rw-r--r--lib/rbot/ircbot.rb1
2 files changed, 3 insertions, 4 deletions
diff --git a/data/rbot/plugins/script.rb b/data/rbot/plugins/script.rb
index 1b695868..29afa20a 100644
--- a/data/rbot/plugins/script.rb
+++ b/data/rbot/plugins/script.rb
@@ -60,7 +60,7 @@ class ScriptPlugin < Plugin
begin
eval( code )
- rescue => e
+ rescue Exception => e
m.reply( "Script '#{name}' crapped out :(" )
m.reply( e.inspect )
end
@@ -75,7 +75,7 @@ class ScriptPlugin < Plugin
# TODO allow different safe levels for different botusers
begin
eval( code )
- rescue => e
+ rescue Exception => e
m.reply( "Script '#{name}' crapped out :(" )
m.reply( e.inspect )
end
@@ -89,7 +89,7 @@ class ScriptPlugin < Plugin
# TODO allow different safe levels for different botusers
begin
m.reply eval( code ).to_s
- rescue => e
+ rescue Exception => e
m.reply( "Script '#{name}' crapped out :(" )
m.reply( e.inspect )
end
diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index 649c02ed..619150fb 100644
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -902,7 +902,6 @@ class Bot
else
lines = all_lines
end
- debug lines.inspect
lines.each { |line|
sendq "#{fixed}#{line}", chan, ring