fix: restart logger thread after fork

[user/henk/code/ruby/rbot.git] / bin / rbot

diff --git a/bin/rbot b/bin/rbot
index 8e762569000eef1886ad77cbf961b893e3f7d84f..8c65f42cadaa63f7ec7718392232181762f46e38 100755 (executable)
--- a/bin/rbot
+++ b/bin/rbot
@@ -36,92 +36,19 @@ Please note that the logfile doesn't contain IRC logs (which are located at
 
 =end
 
-# Copyright (C) 2002 Tom Gilbert.
+# Copyright (C) 2002-2006 Tom Gilbert.
+# Copyright (C) 2007-2008 Giuseppe Bilotta and the rbot development team
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies of the Software and its documentation and acknowledgment shall be
-# given in the documentation and software packages that this Software was
-# used.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# Most of the string processing across rbot is done against IRC messages, which
-# do not have a well-defined encoding. Although many clients are now using
-# UTF-8, there is no guarantee that an arbitrary string received from IRC will
-# be UTF-8 encoded. We have to force ASCII (byte-wise/charset agnostic)
-# matching because otherwise some strings can give problems: in particular, for
-# example, the bytesequence "\340\350\354\362\371" (that is the aeiou vowels,
-# each with a grave accent) will cause the string to be considered up to the
-# "\354" (i with grave accent) only: so either the rest of the message is
-# ignored, or the matching fails.
-$KCODE = 'a'
-
-$VERBOSE=true
+# This is free software, see COPYING for licensing details
 
 require 'etc'
 require 'getoptlong'
 require 'fileutils'
 
-$version="0.9.11-svn"
+$version ||= '0.9.15'
+$version_timestamp ||= 0
 $opts = Hash.new
 
-if $version =~ /svn/
-  if defined?(SVN_DIR) and File.exists?(File.join(SVN_DIR, '.git'))
-    $version.sub!('svn', 'git')
-
-    git_out = `git status`
-
-    git_out.match(/^# On branch (.*)\n/)
-    if $1 # git 1.5.x
-      branch = $1.dup || "unknown"
-      changed = git_out.match(/^# Change(.*)\n/)
-      rev = "revision "
-      git_out = `git log -1 --pretty=format:"%h%n%b"`.split("\n")
-      rev << git_out.first
-      if git_out.last.match(/^git-svn-id: \S+@(\d+)/)
-        rev << "(svn #{$1})"
-      end
-      rev << ", local changes" if changed
-    else # older gits
-      git_out = `git branch`
-      git_out.match(/^\* (.*)\n/)
-      branch = $1.dup rescue "unknown"
-      rev = "revision " + `git rev-parse HEAD`[0,6]
-    end
-
-    $version << " (#{branch} branch, #{rev})"
-  else
-    up = File.dirname(__FILE__) + "/.."
-    rev = " (unknown revision)"
-    begin
-      svn_out = `svn info #{up}`
-      if svn_out =~ /Last Changed Rev: (\d+)/
-        rev = " (revision #{$1}"
-      end
-      svn_st = `svn st #{up}`
-      if svn_st =~ /^[MDA] /
-        rev << ", local changes"
-      end
-      rev << ")"
-    rescue => e
-      puts e.inspect
-    end
-    $version += rev
-  end
-end
-
 orig_opts = ARGV.dup
 
 opts = GetoptLong.new(
@@ -134,17 +61,13 @@ opts = GetoptLong.new(
   ["--version", "-v", GetoptLong::NO_ARGUMENT]
 )
 
-$debug = $DEBUG
 $daemonize = false
 
 opts.each {|opt, arg|
-  $debug = true if(opt == "--debug")
   $daemonize = true if(opt == "--background")
   $opts[opt.sub(/^-+/, "")] = arg
 }
 
-$cl_loglevel = $opts["loglevel"].to_i if $opts["loglevel"]
-
 if ($opts["trace"])
   set_trace_func proc { |event, file, line, id, binding, classname|
     if classname.to_s == $opts["trace"]
@@ -160,8 +83,10 @@ if File.directory? "#{defaultlib}/rbot"
     $:.unshift defaultlib
   end
 end
-  
+
 begin
+  Encoding.default_internal = Encoding::UTF_8
+  Encoding.default_external = Encoding::UTF_8
   require 'rbot/ircbot'
 rescue LoadError => e
   puts "Error: couldn't find the rbot/ircbot module (or one of its dependencies)\n"
@@ -186,6 +111,13 @@ if ($opts["help"])
   exit 0
 end
 
+# setup logger based on command line arguments
+loglevel = $opts['loglevel'] ? $opts['loglevel'].to_i : nil
+loglevel = $opts['debug'] ? 0 : loglevel
+if loglevel
+  Irc::Bot::LoggerManager.instance.set_level(loglevel)
+end
+
 if(bot = Irc::Bot.new(ARGV.shift, :argv => orig_opts))
   # just run the bot
   bot.mainloop