X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fircbot.rb;h=3cd0cae844d2584a5d8647edba4e309937993fac;hb=7c0c7d49240c56124ba0d99a14f6d7156317c499;hp=e171384008d1481cbbe3e633fa21c239146e7ff1;hpb=1ef981bb3b47c396b5b0c99698dcf7063c83d4ff;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb index e1713840..3cd0cae8 100644 --- a/lib/rbot/ircbot.rb +++ b/lib/rbot/ircbot.rb @@ -18,6 +18,9 @@ $logger.datetime_format = $dateformat $logger.level = $cl_loglevel if defined? $cl_loglevel $logger.level = 0 if $debug +$log_queue = Queue.new +$log_thread = nil + require 'pp' unless Kernel.instance_methods.include?("pretty_inspect") @@ -55,18 +58,47 @@ def rawlog(level, message=nil, who_pos=1) else str = message.pretty_inspect end + qmsg = Array.new str.each_line { |l| - $logger.add(level, l.chomp, who) - who.gsub!(/./," ") + qmsg.push [level, l.chomp, who] + who = ' ' * who.size } + $log_queue.push qmsg +end + +def halt_logger + if $log_thread && $log_thread.alive? + $log_queue << nil + $log_thread.join + $log_thread = nil + end +end + +END { halt_logger } + +def restart_logger(newlogger = false) + halt_logger + + $logger = newlogger if newlogger + + $log_thread = Thread.new do + ls = nil + while ls = $log_queue.pop + ls.each { |l| $logger.add(*l) } + end + end end +restart_logger + def log_session_start $logger << "\n\n=== #{botclass} session started on #{Time.now.strftime($dateformat)} ===\n\n" + restart_logger end def log_session_end $logger << "\n\n=== #{botclass} session ended on #{Time.now.strftime($dateformat)} ===\n\n" + $log_queue << nil end def debug(message=nil, who_pos=1) @@ -102,7 +134,7 @@ $interrupted = 0 require 'rbot/rbotconfig' require 'rbot/load-gettext' require 'rbot/config' -# require 'rbot/utils' +require 'rbot/config-compat' require 'rbot/irc' require 'rbot/rfc2812' @@ -110,12 +142,10 @@ require 'rbot/ircsocket' require 'rbot/botuser' require 'rbot/timer' require 'rbot/plugins' -# require 'rbot/channel' require 'rbot/message' require 'rbot/language' require 'rbot/dbhash' require 'rbot/registry' -# require 'rbot/httputil' module Irc @@ -123,11 +153,11 @@ module Irc # handles them or passes them to plugins, and contains core functionality. class Bot COPYRIGHT_NOTICE = "(c) Tom Gilbert and the rbot development team" - SOURCE_URL = "http://linuxbrit.co.uk/rbot" + SOURCE_URL = "http://ruby-rbot.org" # the bot's Auth data attr_reader :auth - # the bot's BotConfig data + # the bot's Config data attr_reader :config # the botclass for this bot (determines configdir among other things) @@ -177,60 +207,92 @@ class Bot myself.nick end + # bot inspection + # TODO multiserver + def inspect + ret = self.to_s[0..-2] + ret << ' version=' << $version.inspect + ret << ' botclass=' << botclass.inspect + ret << ' lang="' << lang.language + if defined?(GetText) + ret << '/' << locale + end + ret << '"' + ret << ' nick=' << nick.inspect + ret << ' server=' + if server + ret << (server.to_s + (socket ? + ' [' << socket.server_uri.to_s << ']' : '')).inspect + unless server.channels.empty? + ret << " channels=" + ret << server.channels.map { |c| + "%s%s" % [c.modes_of(nick).map { |m| + server.prefix_for_mode(m) + }, c.name] + }.inspect + end + else + ret << '(none)' + end + ret << ' plugins=' << plugins.inspect + ret << ">" + end + + # create a new Bot with botclass +botclass+ def initialize(botclass, params = {}) - # BotConfig for the core bot + # Config for the core bot # TODO should we split socket stuff into ircsocket, etc? - BotConfig.register BotConfigArrayValue.new('server.list', + Config.register Config::ArrayValue.new('server.list', :default => ['irc://localhost'], :wizard => true, :requires_restart => true, :desc => "List of irc servers rbot should try to connect to. Use comma to separate values. Servers are in format 'server.doma.in:port'. If port is not specified, default value (6667) is used.") - BotConfig.register BotConfigBooleanValue.new('server.ssl', + Config.register Config::BooleanValue.new('server.ssl', :default => false, :requires_restart => true, :wizard => true, :desc => "Use SSL to connect to this server?") - BotConfig.register BotConfigStringValue.new('server.password', + Config.register Config::StringValue.new('server.password', :default => false, :requires_restart => true, :desc => "Password for connecting to this server (if required)", :wizard => true) - BotConfig.register BotConfigStringValue.new('server.bindhost', + Config.register Config::StringValue.new('server.bindhost', :default => false, :requires_restart => true, :desc => "Specific local host or IP for the bot to bind to (if required)", :wizard => true) - BotConfig.register BotConfigIntegerValue.new('server.reconnect_wait', + Config.register Config::IntegerValue.new('server.reconnect_wait', :default => 5, :validate => Proc.new{|v| v >= 0}, :desc => "Seconds to wait before attempting to reconnect, on disconnect") - BotConfig.register BotConfigFloatValue.new('server.sendq_delay', + Config.register Config::FloatValue.new('server.sendq_delay', :default => 2.0, :validate => Proc.new{|v| v >= 0}, :desc => "(flood prevention) the delay between sending messages to the server (in seconds)", :on_change => Proc.new {|bot, v| bot.socket.sendq_delay = v }) - BotConfig.register BotConfigIntegerValue.new('server.sendq_burst', + Config.register Config::IntegerValue.new('server.sendq_burst', :default => 4, :validate => Proc.new{|v| v >= 0}, :desc => "(flood prevention) max lines to burst to the server before throttling. Most ircd's allow bursts of up 5 lines", :on_change => Proc.new {|bot, v| bot.socket.sendq_burst = v }) - BotConfig.register BotConfigIntegerValue.new('server.ping_timeout', + Config.register Config::IntegerValue.new('server.ping_timeout', :default => 30, :validate => Proc.new{|v| v >= 0}, :desc => "reconnect if server doesn't respond to PING within this many seconds (set to 0 to disable)") - BotConfig.register BotConfigStringValue.new('irc.nick', :default => "rbot", + Config.register Config::StringValue.new('irc.nick', :default => "rbot", :desc => "IRC nickname the bot should attempt to use", :wizard => true, :on_change => Proc.new{|bot, v| bot.sendq "NICK #{v}" }) - BotConfig.register BotConfigStringValue.new('irc.name', + Config.register Config::StringValue.new('irc.name', :default => "Ruby bot", :requires_restart => true, :desc => "IRC realname the bot should use") - BotConfig.register BotConfigBooleanValue.new('irc.name_copyright', + Config.register Config::BooleanValue.new('irc.name_copyright', :default => true, :requires_restart => true, :desc => "Append copyright notice to bot realname? (please don't disable unless it's really necessary)") - BotConfig.register BotConfigStringValue.new('irc.user', :default => "rbot", + Config.register Config::StringValue.new('irc.user', :default => "rbot", :requires_restart => true, :desc => "local user the bot should appear to be", :wizard => true) - BotConfig.register BotConfigArrayValue.new('irc.join_channels', + Config.register Config::ArrayValue.new('irc.join_channels', :default => [], :wizard => true, :desc => "What channels the bot should always join at startup. List multiple channels using commas to separate. If a channel requires a password, use a space after the channel name. e.g: '#chan1, #chan2, #secretchan secritpass, #chan3'") - BotConfig.register BotConfigArrayValue.new('irc.ignore_users', + Config.register Config::ArrayValue.new('irc.ignore_users', :default => [], :desc => "Which users to ignore input from. This is mainly to avoid bot-wars triggered by creative people") - BotConfig.register BotConfigIntegerValue.new('core.save_every', + Config.register Config::IntegerValue.new('core.save_every', :default => 60, :validate => Proc.new{|v| v >= 0}, :on_change => Proc.new { |bot, v| if @save_timer @@ -249,73 +311,73 @@ class Bot }, :desc => "How often the bot should persist all configuration to disk (in case of a server crash, for example)") - BotConfig.register BotConfigBooleanValue.new('core.run_as_daemon', + Config.register Config::BooleanValue.new('core.run_as_daemon', :default => false, :requires_restart => true, :desc => "Should the bot run as a daemon?") - BotConfig.register BotConfigStringValue.new('log.file', + Config.register Config::StringValue.new('log.file', :default => false, :requires_restart => true, :desc => "Name of the logfile to which console messages will be redirected when the bot is run as a daemon") - BotConfig.register BotConfigIntegerValue.new('log.level', + Config.register Config::IntegerValue.new('log.level', :default => 1, :requires_restart => false, :validate => Proc.new { |v| (0..5).include?(v) }, :on_change => Proc.new { |bot, v| $logger.level = v }, :desc => "The minimum logging level (0=DEBUG,1=INFO,2=WARN,3=ERROR,4=FATAL) for console messages") - BotConfig.register BotConfigIntegerValue.new('log.keep', + Config.register Config::IntegerValue.new('log.keep', :default => 1, :requires_restart => true, :validate => Proc.new { |v| v >= 0 }, :desc => "How many old console messages logfiles to keep") - BotConfig.register BotConfigIntegerValue.new('log.max_size', + Config.register Config::IntegerValue.new('log.max_size', :default => 10, :requires_restart => true, :validate => Proc.new { |v| v > 0 }, :desc => "Maximum console messages logfile size (in megabytes)") - BotConfig.register BotConfigArrayValue.new('plugins.path', + Config.register Config::ArrayValue.new('plugins.path', :wizard => true, :default => ['(default)', '(default)/games', '(default)/contrib'], :requires_restart => false, :on_change => Proc.new { |bot, v| bot.setup_plugins_path }, :desc => "Where the bot should look for plugins. List multiple directories using commas to separate. Use '(default)' for default prepackaged plugins collection, '(default)/contrib' for prepackaged unsupported plugins collection") - BotConfig.register BotConfigEnumValue.new('send.newlines', + Config.register Config::EnumValue.new('send.newlines', :values => ['split', 'join'], :default => 'split', :on_change => Proc.new { |bot, v| bot.set_default_send_options :newlines => v.to_sym }, :desc => "When set to split, messages with embedded newlines will be sent as separate lines. When set to join, newlines will be replaced by the value of join_with") - BotConfig.register BotConfigStringValue.new('send.join_with', + Config.register Config::StringValue.new('send.join_with', :default => ' ', :on_change => Proc.new { |bot, v| bot.set_default_send_options :join_with => v.dup }, :desc => "String used to replace newlines when send.newlines is set to join") - BotConfig.register BotConfigIntegerValue.new('send.max_lines', + Config.register Config::IntegerValue.new('send.max_lines', :default => 5, :validate => Proc.new { |v| v >= 0 }, :on_change => Proc.new { |bot, v| bot.set_default_send_options :max_lines => v }, :desc => "Maximum number of IRC lines to send for each message (set to 0 for no limit)") - BotConfig.register BotConfigEnumValue.new('send.overlong', + Config.register Config::EnumValue.new('send.overlong', :values => ['split', 'truncate'], :default => 'split', :on_change => Proc.new { |bot, v| bot.set_default_send_options :overlong => v.to_sym }, :desc => "When set to split, messages which are too long to fit in a single IRC line are split into multiple lines. When set to truncate, long messages are truncated to fit the IRC line length") - BotConfig.register BotConfigStringValue.new('send.split_at', + Config.register Config::StringValue.new('send.split_at', :default => '\s+', :on_change => Proc.new { |bot, v| bot.set_default_send_options :split_at => Regexp.new(v) }, :desc => "A regular expression that should match the split points for overlong messages (see send.overlong)") - BotConfig.register BotConfigBooleanValue.new('send.purge_split', + Config.register Config::BooleanValue.new('send.purge_split', :default => true, :on_change => Proc.new { |bot, v| bot.set_default_send_options :purge_split => v }, :desc => "Set to true if the splitting boundary (set in send.split_at) should be removed when splitting overlong messages (see send.overlong)") - BotConfig.register BotConfigStringValue.new('send.truncate_text', + Config.register Config::StringValue.new('send.truncate_text', :default => "#{Reverse}...#{Reverse}", :on_change => Proc.new { |bot, v| bot.set_default_send_options :truncate_text => v.dup @@ -337,9 +399,9 @@ class Bot unless botclass and not botclass.empty? # We want to find a sensible default. - # * On POSIX systems we prefer ~/.rbot for the effective uid of the process - # * On Windows (at least the NT versions) we want to put our stuff in the - # Application Data folder. + # * On POSIX systems we prefer ~/.rbot for the effective uid of the process + # * On Windows (at least the NT versions) we want to put our stuff in the + # Application Data folder. # We don't use any particular O/S detection magic, exploiting the fact that # Etc.getpwuid is nil on Windows if Etc.getpwuid(Process::Sys.geteuid) @@ -364,7 +426,6 @@ class Bot FileUtils.cp_r Config::datadir+'/templates', botclass end - Dir.mkdir("#{botclass}/logs") unless File.exist?("#{botclass}/logs") Dir.mkdir("#{botclass}/registry") unless File.exist?("#{botclass}/registry") Dir.mkdir("#{botclass}/safe_save") unless File.exist?("#{botclass}/safe_save") @@ -376,7 +437,7 @@ class Bot @startup_time = Time.new begin - @config = BotConfig.configmanager + @config = Config.manager @config.bot_associate(self) rescue Exception => e fatal e @@ -391,6 +452,7 @@ class Bot @logfile = @config['log.file'] if @logfile.class!=String || @logfile.empty? @logfile = "#{botclass}/#{File.basename(botclass).gsub(/^\.+/,'')}.log" + debug "Using `#{@logfile}' as debug log" end # See http://blog.humlab.umu.se/samuel/archives/000107.html @@ -409,18 +471,36 @@ class Bot end Dir.chdir botclass # 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 + + restart_logger(logger) + + log_session_start + + if $daemonize log "Redirecting standard input/output/error" - begin - STDIN.reopen "/dev/null" - rescue Errno::ENOENT - # On Windows, there's not such thing as /dev/null - STDIN.reopen "NUL" + [$stdin, $stdout, $stderr].each do |fd| + begin + fd.reopen "/dev/null" + rescue Errno::ENOENT + # On Windows, there's not such thing as /dev/null + fd.reopen "NUL" + end end - def STDOUT.write(str=nil) + + def $stdout.write(str=nil) log str, 2 return str.to_s.size end - def STDERR.write(str=nil) + def $stdout.write(str=nil) if str.to_s.match(/:\d+: warning:/) warning str, 2 else @@ -430,20 +510,11 @@ class Bot end end - # Set the new logfile and loglevel. This must be done after the daemonizing - $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 - - log_session_start - File.open($opts['pidfile'] || "#{@botclass}/rbot.pid", 'w') do |pf| pf << "#{$$}\n" end - @registry = BotRegistry.new self + @registry = Registry.new self @timer = Timer.new @save_mutex = Mutex.new @@ -454,13 +525,11 @@ class Bot end @quit_mutex = Mutex.new - @logs = Hash.new - @plugins = nil @lang = Language.new(self, @config['core.language']) begin - @auth = Auth::authmanager + @auth = Auth::manager @auth.bot_associate(self) # @auth.load("#{botclass}/botusers.yaml") rescue Exception => e @@ -486,7 +555,7 @@ class Bot debug "server.list is now #{@config['server.list'].inspect}" end - @socket = IrcSocket.new(@config['server.list'], @config['server.bindhost'], @config['server.sendq_delay'], @config['server.sendq_burst'], :ssl => @config['server.ssl']) + @socket = Irc::Socket.new(@config['server.list'], @config['server.bindhost'], @config['server.sendq_delay'], @config['server.sendq_burst'], :ssl => @config['server.ssl']) @client = Client.new @plugins.scan @@ -495,11 +564,12 @@ class Bot # Array of channels names where the bot should be quiet # '*' means all channels # - @quiet = [] + @quiet = Set.new @client[:welcome] = proc {|data| - irclog "joined server #{@client.server} as #{myself}", "server" + m = WelcomeMessage.new(self, server, data[:source], data[:target], data[:message]) + @plugins.delegate("welcome", m) @plugins.delegate("connect") @config['irc.join_channels'].each { |c| @@ -536,34 +606,22 @@ class Bot # debug "Message target is #{data[:target].inspect}" # debug "Bot is #{myself.inspect}" - ignored = false @config['irc.ignore_users'].each { |mask| if m.source.matches?(server.new_netmask(mask)) - ignored = true - break + m.ignored = true end } - irclogprivmsg(m) - - unless ignored - @plugins.delegate "listen", m - @plugins.delegate("ctcp_listen", m) if m.ctcp - @plugins.privmsg(m) if m.address? - if not m.replied - @plugins.delegate "unreplied", m - end - end + @plugins.irc_delegate('privmsg', m) } @client[:notice] = proc { |data| message = NoticeMessage.new(self, server, data[:source], data[:target], data[:message]) # pass it off to plugins that want to hear everything - @plugins.delegate "listen", message + @plugins.irc_delegate "notice", message } @client[:motd] = proc { |data| - data[:motd].each_line { |line| - irclog "MOTD: #{line}", "server" - } + m = MotdMessage.new(self, server, data[:source], data[:target], data[:motd]) + @plugins.delegate "motd", m } @client[:nicktaken] = proc { |data| new = "#{data[:nick]}_" @@ -593,80 +651,66 @@ class Bot old = data[:oldnick] new = data[:newnick] m = NickMessage.new(self, server, source, old, new) + m.is_on = data[:is_on] if source == myself debug "my nick is now #{new}" end - data[:is_on].each { |ch| - irclog "@ #{old} is now known as #{new}", ch - } - @plugins.delegate("listen", m) - @plugins.delegate("nick", m) + @plugins.irc_delegate("nick", m) } @client[:quit] = proc {|data| source = data[:source] message = data[:message] m = QuitMessage.new(self, server, source, source, message) - data[:was_on].each { |ch| - irclog "@ Quit: #{source}: #{message}", ch - } - @plugins.delegate("listen", m) - @plugins.delegate("quit", m) + m.was_on = data[:was_on] + @plugins.irc_delegate("quit", m) } @client[:mode] = proc {|data| - irclog "@ Mode #{data[:modestring]} by #{data[:source]}", data[:channel] + m = ModeChangeMessage.new(self, server, data[:source], data[:target], data[:modestring]) + m.modes = data[:modes] + @plugins.delegate "modechange", m } @client[:join] = proc {|data| m = JoinMessage.new(self, server, data[:source], data[:channel], data[:message]) - irclogjoin(m) - - @plugins.delegate("listen", m) - @plugins.delegate("join", m) - sendq "WHO #{data[:channel]}", data[:channel], 2 + sendq("MODE #{data[:channel]}", nil, 0) if m.address? + @plugins.irc_delegate("join", m) + sendq("WHO #{data[:channel]}", data[:channel], 2) if m.address? } @client[:part] = proc {|data| m = PartMessage.new(self, server, data[:source], data[:channel], data[:message]) - irclogpart(m) - - @plugins.delegate("listen", m) - @plugins.delegate("part", m) + @plugins.irc_delegate("part", m) } @client[:kick] = proc {|data| m = KickMessage.new(self, server, data[:source], data[:target], data[:channel],data[:message]) - irclogkick(m) - - @plugins.delegate("listen", m) - @plugins.delegate("kick", m) + @plugins.irc_delegate("kick", m) } @client[:invite] = proc {|data| - if data[:target] == myself - join data[:channel] if @auth.allow?("join", data[:source], data[:source].nick) - end + m = InviteMessage.new(self, server, data[:source], data[:target], data[:channel]) + @plugins.irc_delegate("invite", m) } @client[:changetopic] = proc {|data| m = TopicMessage.new(self, server, data[:source], data[:channel], data[:topic]) - irclogtopic(m) - - @plugins.delegate("listen", m) - @plugins.delegate("topic", m) - } - @client[:topic] = proc { |data| - irclog "@ Topic is \"#{data[:topic]}\"", data[:channel] + m.info_or_set = :set + @plugins.irc_delegate("topic", m) } + # @client[:topic] = proc { |data| + # irclog "@ Topic is \"#{data[:topic]}\"", data[:channel] + # } @client[:topicinfo] = proc { |data| channel = data[:channel] topic = channel.topic - irclog "@ Topic set by #{topic.set_by} on #{topic.set_on}", channel m = TopicMessage.new(self, server, data[:source], channel, topic) - - @plugins.delegate("listen", m) - @plugins.delegate("topic", m) + m.info_or_set = :info + @plugins.irc_delegate("topic", m) } @client[:names] = proc { |data| - @plugins.delegate "names", data[:channel], data[:users] + m = NamesMessage.new(self, server, server, data[:channel]) + m.users = data[:users] + @plugins.delegate "names", m } @client[:unknown] = proc { |data| #debug "UNKNOWN: #{data[:serverstring]}" - irclog data[:serverstring], ".unknown" + m = UnknownMessage.new(self, server, server, nil, data[:serverstring]) + @plugins.delegate "unknown_message", m } set_default_send_options :newlines => @config['send.newlines'].to_sym, @@ -676,6 +720,8 @@ class Bot :split_at => Regexp.new(@config['send.split_at']), :purge_split => @config['send.purge_split'], :truncate_text => @config['send.truncate_text'].dup + + trap_sigs end def setup_plugins_path @@ -714,17 +760,17 @@ class Bot return @quiet.include?('*') || @quiet.include?(channel.downcase) end - def set_quiet(channel) + def set_quiet(channel = nil) if channel ch = channel.downcase.dup - @quiet << ch unless @quiet.include?(ch) + @quiet << ch else @quiet.clear @quiet << '*' end end - def reset_quiet(channel) + def reset_quiet(channel = nil) if channel @quiet.delete channel.downcase else @@ -733,10 +779,10 @@ class Bot end # things to do when we receive a signal - def got_sig(sig) - debug "received #{sig}, queueing quit" + def got_sig(sig, func=:quit) + debug "received #{sig}, queueing #{func}" $interrupted += 1 - quit unless @quit_mutex.locked? + self.send(func) unless @quit_mutex.locked? debug "interrupted #{$interrupted} times" if $interrupted >= 3 debug "drastic!" @@ -745,17 +791,21 @@ class Bot end end - # connect the bot to IRC - def connect + # trap signals + def trap_sigs begin trap("SIGINT") { got_sig("SIGINT") } trap("SIGTERM") { got_sig("SIGTERM") } - trap("SIGHUP") { got_sig("SIGHUP") } + trap("SIGHUP") { got_sig("SIGHUP", :restart) } rescue ArgumentError => e debug "failed to trap signals (#{e.pretty_inspect}): running on Windows?" rescue Exception => e debug "failed to trap signals: #{e.pretty_inspect}" end + end + + # connect the bot to IRC + def connect begin quit if $interrupted > 0 @socket.connect @@ -941,7 +991,7 @@ class Bot lines.each { |line| sendq "#{fixed}#{line}", chan, ring - log_sent(type, where, line) + delegate_sent(type, where, line) } end @@ -983,24 +1033,6 @@ class Bot say where, @lang.get("okay") end - # log IRC-related message +message+ to a file determined by +where+. - # +where+ can be a channel name, or a nick for private message logging - def irclog(message, where="server") - message = message.chomp - stamp = Time.now.strftime("%Y/%m/%d %H:%M:%S") - if where.class <= Server - where_str = "server" - else - where_str = where.downcase.gsub(/[:!?$*()\/\\<>|"']/, "_") - end - unless(@logs.has_key?(where_str)) - @logs[where_str] = File.new("#{@botclass}/logs/#{where_str}", "a") - @logs[where_str].sync = true - end - @logs[where_str].puts "[#{stamp}] #{message}" - #debug "[#{stamp}] <#{where}> #{message}" - end - # set topic of channel +where+ to +topic+ def topic(where, topic) sendq "TOPIC #{where} :#{topic}", where, 2 @@ -1009,19 +1041,21 @@ class Bot def disconnect(message=nil) message = @lang.get("quit") if (!message || message.empty?) if @socket.connected? - debug "Clearing socket" - @socket.clearq - debug "Sending quit message" - @socket.emergency_puts "QUIT :#{message}" - debug "Flushing socket" - @socket.flush + begin + debug "Clearing socket" + @socket.clearq + debug "Sending quit message" + @socket.emergency_puts "QUIT :#{message}" + debug "Logging quits" + delegate_sent('QUIT', myself, message) + debug "Flushing socket" + @socket.flush + rescue SocketError => e + error "error while disconnecting socket: #{e.pretty_inspect}" + end debug "Shutting down socket" @socket.shutdown end - debug "Logging quits" - server.channels.each { |ch| - irclog "@ quit (#{message})", ch - } stop_server_pings @client.reset end @@ -1077,9 +1111,11 @@ class Bot # now we re-exec # Note, this fails on Windows debug "going to exec #{$0} #{@argv.inspect} from #{@run_dir}" + log_session_end Dir.chdir(@run_dir) exec($0, *@argv) rescue Errno::ENOENT + log_session_end exec("ruby", *(@argv.unshift $0)) rescue Exception => e $interrupted += 1 @@ -1199,75 +1235,18 @@ class Bot private - def irclogprivmsg(m) - if(m.action?) - if(m.private?) - irclog "* [#{m.source}(#{m.sourceaddress})] #{m.message}", m.source - else - irclog "* #{m.source} #{m.message}", m.target - end - else - if(m.public?) - irclog "<#{m.source}> #{m.message}", m.target - else - irclog "[#{m.source}(#{m.sourceaddress})] #{m.message}", m.source - end - end - end - - # log a message. Internal use only. - def log_sent(type, where, message) + # delegate sent messages + def delegate_sent(type, where, message) + args = [self, server, myself, server.user_or_channel(where.to_s), message] case type when "NOTICE" - case where - when Channel - irclog "-=#{myself}=- #{message}", where - else - irclog "[-=#{where}=-] #{message}", where - end + m = NoticeMessage.new(*args) when "PRIVMSG" - case where - when Channel - irclog "<#{myself}> #{message}", where - else - irclog "[msg(#{where})] #{message}", where - end - end - end - - def irclogjoin(m) - if m.address? - debug "joined channel #{m.channel}" - irclog "@ Joined channel #{m.channel}", m.channel - else - irclog "@ #{m.source} joined channel #{m.channel}", m.channel - end - end - - def irclogpart(m) - if(m.address?) - debug "left channel #{m.channel}" - irclog "@ Left channel #{m.channel} (#{m.message})", m.channel - else - irclog "@ #{m.source} left channel #{m.channel} (#{m.message})", m.channel - end - end - - def irclogkick(m) - if(m.address?) - debug "kicked from channel #{m.channel}" - irclog "@ You have been kicked from #{m.channel} by #{m.source} (#{m.message})", m.channel - else - irclog "@ #{m.target} has been kicked from #{m.channel} by #{m.source} (#{m.message})", m.channel - end - end - - def irclogtopic(m) - if m.source == myself - irclog "@ I set topic \"#{m.topic}\"", m.channel - else - irclog "@ #{m.source} set topic \"#{m.topic}\"", m.channel + m = PrivMessage.new(*args) + when "QUIT" + m = QuitMessage.new(*args) end + @plugins.delegate('sent', m) end end