ircbot: do not use debug in sendmsg() because it breaks script. script plugin: handle...

diff --git a/data/rbot/plugins/script.rb b/data/rbot/plugins/script.rb
index 1b69586816c06a53365da5299a8f27ddc796cf07..29afa20a62e183fea66450382ef1a91722b1bd21 100644 (file)
--- 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 649c02eda8cb23330cb71bc88e750cc6dda508d3..619150fbf6d591552ede4c52af6ba4db28073b8f 100644 (file)
--- 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