test: fix shadowed test method

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

diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index caabc15dc325f769ca7932cc4ba69b4de99980b5..2e808b9ee5d5503cc459b7f88173553266b5a3e2 100644 (file)
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -15,7 +15,7 @@ $debug = false unless $debug
 $daemonize = false unless $daemonize
 
 $dateformat = "%Y/%m/%d %H:%M:%S"
-$logger = Logger.new($stderr)
+$logger = Logger.new(STDERR)
 $logger.datetime_format = $dateformat
 $logger.level = $cl_loglevel if defined? $cl_loglevel
 $logger.level = 0 if $debug
@@ -127,12 +127,6 @@ def fatal(message=nil, who_pos=1)
   rawlog(Logger::Severity::FATAL, message, who_pos)
 end
 
-debug "debug test"
-log "log test"
-warning "warning test"
-error "error test"
-fatal "fatal test"
-
 # The following global is used for the improved signal handling.
 $interrupted = 0
 
@@ -156,7 +150,6 @@ require 'rbot/registry'
 require 'rbot/plugins'
 require 'rbot/message'
 require 'rbot/language'
-require 'rbot/journal'
 
 module Irc
 
@@ -164,7 +157,7 @@ module Irc
 # handles them or passes them to plugins, and contains core functionality.
 class Bot
   COPYRIGHT_NOTICE = "(c) Giuseppe Bilotta and the rbot development team"
-  SOURCE_URL = "http://ruby-rbot.org"
+  SOURCE_URL = "https://ruby-rbot.org"
   # the bot's Auth data
   attr_reader :auth
 
@@ -205,9 +198,6 @@ class Bot
   # web service
   attr_accessor :webservice
 
-  # persistent message queue
-  attr_accessor :journal
-
   # server we are connected to
   # TODO multiserver
   def server
@@ -538,20 +528,20 @@ class Bot
       # File.umask 0000                # Ensure sensible umask. Adjust as needed.
     end
 
-    logger = Logger.new(@logfile,
-                        @config['log.keep'],
-                        @config['log.max_size']*1024*1024)
-    logger.datetime_format= $dateformat
-    logger.level = @config['log.level']
-    logger.level = $cl_loglevel if defined? $cl_loglevel
-    logger.level = 0 if $debug
+    unless $debug
+      logger = Logger.new(@logfile,
+                          @config['log.keep'],
+                          @config['log.max_size']*1024*1024)
+      logger.datetime_format= $dateformat
+      logger.level = @config['log.level']
+      logger.level = $cl_loglevel if defined? $cl_loglevel
+      logger.level = 0 if $debug
 
-    restart_logger(logger)
+      restart_logger(logger)
+    end
 
     log_session_start
 
-    @journal = Journal::JournalBroker.new(bot: self)
-
     if $daemonize
       log "Redirecting standard input/output/error"
       [$stdin, $stdout, $stderr].each do |fd|