require 'rbot/plugins'
require 'rbot/message'
require 'rbot/language'
+require 'rbot/httputil'
module Irc
repopulate_botclass_directory
- save_dir = File.join(@botclass, 'safe_save')
- Dir.mkdir(save_dir) unless File.exist?(save_dir)
- unless FileTest.directory? save_dir
- error "safe save location #{save_dir} is not a directory"
- exit 2
- end
-
# Time at which the last PING was sent
@last_ping = nil
# Time at which the last line was RECV'd from the server
debug "Using `#{@logfile}' as debug log"
end
+ LoggerManager.instance.flush
+
# See http://blog.humlab.umu.se/samuel/archives/000107.html
# for the backgrounding code
if $daemonize
# File.umask 0000 # Ensure sensible umask. Adjust as needed.
end
- # setup logger based on bot configuration
- LoggerManager.instance.set_level(@config['log.level'])
+ # setup logger based on bot configuration, if not set from the command line
+ loglevel_set = $opts.has_key?('debug') or $opts.has_key?('loglevel')
+ LoggerManager.instance.set_level(@config['log.level']) unless loglevel_set
+
+ # Set the logfile
LoggerManager.instance.set_logfile(@logfile, @config['log.keep'], @config['log.max_size'])
if $daemonize
- log "Redirecting standard input/output/error"
+ log "Redirecting standard input/output/error, console logger disabled"
+ LoggerManager.instance.flush
+ LoggerManager.instance.disable_console_logger
+
[$stdin, $stdout, $stderr].each do |fd|
begin
fd.reopen "/dev/null"
end
end
- def $stdout.write(str=nil)
+ def $stdout.write(*args)
+ str = args.map { |s| s.to_s }.join("")
log str, 2
- return str.to_s.size
+ return str.bytesize
end
- def $stdout.write(str=nil)
+ def $stderr.write(*args)
+ str = args.map { |s| s.to_s }.join("")
if str.to_s.match(/:\d+: warning:/)
warning str, 2
else
error str, 2
end
- return str.to_s.size
+ return str.bytesize
end
+
+ LoggerManager.instance.log_session_start
end
File.open($opts['pidfile'] || File.join(@botclass, 'rbot.pid'), 'w') do |pf|
@plugins = nil
@lang = Language.new(self, @config['core.language'])
+ @httputil = Utils::HttpUtil.new(self)
begin
@auth = Auth::manager
# to inform us that our nick has been changed.
if data[:target] == '*'
debug "setting my connection nick to #{new}"
- nick = new
+ @client.user.nick = new
end
@plugins.delegate "nicktaken", data[:nick]
}
# begin event handling loop
def mainloop
- while true
+ @keep_looping = true
+ while @keep_looping
too_fast = 0
quit_msg = nil
valid_recv = false # did we receive anything (valid) from the server yet?
# exceptions that ARENT SocketError's. How am I supposed to handle
# that?
rescue SystemExit
- exit 0
+ @keep_looping = false
+ break
rescue Errno::ETIMEDOUT, Errno::ECONNABORTED, TimeoutError, SocketError => e
error "network exception: #{e.pretty_inspect}"
quit_msg = e.to_s
debug "\tignoring cleanup error: #{$!}"
end
end
+ @httputil.cleanup
# debug "\tstopping timers ..."
# @timer.stop
# debug "Closing registries"
begin
shutdown(message)
ensure
- exit 0
+ @keep_looping = false
end
end
:wait => @config['server.reconnect_wait']
} if (!message || message.empty?)
shutdown(message)
+
+ Irc::Bot::LoggerManager.instance.flush
+ Irc::Bot::LoggerManager.instance.log_session_end
+
sleep @config['server.reconnect_wait']
begin
# now we re-exec