* (timer) stop the bot timer for shutdown / rescan

[user/henk/code/ruby/rbot.git] / lib / rbot / plugins.rb

diff --git a/lib/rbot/plugins.rb b/lib/rbot/plugins.rb
index ba6175fa3733e23ed547d7b53c2d99e19dc4a258..99ae31b6f03db8ddd2d7ed32493879ca3ec409cb 100644 (file)
--- a/lib/rbot/plugins.rb
+++ b/lib/rbot/plugins.rb
@@ -366,7 +366,7 @@ module Plugins
         return :loaded
       rescue Exception => err
         # rescue TimeoutError, StandardError, NameError, LoadError, SyntaxError => err
-        warning report_error("#{desc}#{fname} load failed", err)
+        error report_error("#{desc}#{fname} load failed", err)
         bt = err.backtrace.select { |line|
           line.match(/^(\(eval\)|#{fname}):\d+/)
         }
@@ -494,7 +494,7 @@ module Plugins
           output << n_("%{count} plugin: %{list}",
                        "%{count} plugins: %{list}", self.length) %
                    { :count => self.length,
-                     :list => core_modules.collect{ |p| p.name}.sort.join(", ") }
+                     :list => plugins.collect{ |p| p.name}.sort.join(", ") }
         end
       else
         output << "no plugins active"
@@ -519,14 +519,14 @@ module Plugins
         if short
           output << n_("%{highlight}%{count} plugin failed to load%{highlight}",
                        "%{highlight}%{count} plugins failed to load%{highlight}",
-                       @ignored.length) %
-                    { :count => @ignored.length, :highlight => Reverse }
+                       @failed.length) %
+                    { :count => @failed.length, :highlight => Reverse }
         else
           output << n_("%{highlight}%{count} plugin failed to load%{highlight}: use %{bold}%{command}%{bold} to see why",
                        "%{highlight}%{count} plugins failed to load%{highlight}: use %{bold}%{command}%{bold} to see why",
-                       @ignored.length) %
-                    { :count => @ignored.length, :highlight => Reverse,
-                      :bold => Bold, :command => "#{Bold}help failed plugins#{Bold}"}
+                       @failed.length) %
+                    { :count => @failed.length, :highlight => Reverse,
+                      :bold => Bold, :command => "help failed plugins"}
         end
       end
       output.join '; '
@@ -554,7 +554,7 @@ module Plugins
         # debug "Failures: #{@failed.inspect}"
         return _("no plugins failed to load") if @failed.empty?
         return @failed.collect { |p|
-          _('%{highlight}%{plugin}%{highlight} in %{dir}failed with error %{exception}: %{reason}') % {
+          _('%{highlight}%{plugin}%{highlight} in %{dir} failed with error %{exception}: %{reason}') % {
               :highlight => Bold, :plugin => p[:name], :dir => p[:dir],
               :exception => p[:reason].class, :reason => p[:reason],
           } + if $1 && !p[:reason].backtrace.empty?