fix: preserve loglevels across options and files

diff --git a/bin/rbot b/bin/rbot
index 86f907cfff93e919475c5b1eddbd5d2ee2c99d71..82ee9c9a4b9f28958369ad9c5dc78d662027e91a 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -114,7 +114,7 @@ end
 if(bot = Irc::Bot.new(ARGV.shift, :argv => orig_opts))
   # setup logger based on command line arguments
   loglevel = $opts['loglevel'] ? $opts['loglevel'].to_i : nil
-  loglevel = $opts['debug'] ? 0 : nil
+  loglevel = $opts['debug'] ? 0 : loglevel
   if loglevel
     Irc::Bot::LoggerManager.instance.set_level(loglevel)
   end

diff --git a/lib/rbot/logger.rb b/lib/rbot/logger.rb
index 1598f7bd7597fd9fc83a4285c1d2f8f1dd84189c..b5f615d7881ed061f948a28ec1db55cd65601e35 100644 (file)
--- a/lib/rbot/logger.rb
+++ b/lib/rbot/logger.rb
@@ -29,6 +29,7 @@ class Bot
     def set_logfile(filename, keep, max_size)
       @file_logger = Logger.new(filename, keep, max_size*1024*1024)
       @file_logger.datetime_format = @dateformat
+      @file_logger.level = @logger.level
     end
 
     def set_level(level)