require 'pp'
-unless Kernel.instance_methods.include?("pretty_inspect")
+unless Kernel.respond_to? :pretty_inspect
def pretty_inspect
PP.pp(self, '')
end
require 'rbot/plugins'
require 'rbot/message'
require 'rbot/language'
-require 'rbot/dbhash'
-require 'rbot/registry'
module Irc
attr_reader :socket
# bot's object registry, plugins get an interface to this for persistant
- # storage (hash interface tied to a bdb file, plugins use Accessors to store
+ # storage (hash interface tied to a db file, plugins use Accessors to store
# and restore objects in their own namespaces.)
attr_reader :registry
# bot's plugins. This is an instance of class Plugins
attr_reader :plugins
- # bot's httputil help object, for fetching resources via http. Sets up
+ # bot's httputil helper object, for fetching resources via http. Sets up
# proxies etc as defined by the bot configuration/environment
attr_accessor :httputil
bot.socket.penalty_pct = v
},
:desc => "Percentage of IRC penalty to consider when sending messages to prevent being disconnected for excess flood. Set to 0 to disable penalty control.")
+ Config.register Config::StringValue.new('core.db',
+ :default => "bdb",
+ :wizard => true, :default => "bdb",
+ :validate => Proc.new { |v| ["bdb", "tc"].include? v },
+ :requires_restart => true,
+ :desc => "DB adaptor to use for storing settings and plugin data. Options are: bdb (Berkeley DB, stable adaptor, but troublesome to install and unmaintained), tc (Tokyo Cabinet, new adaptor, fast and furious, but may be not available and contain bugs)")
@argv = params[:argv]
@run_dir = params[:run_dir] || Dir.pwd
$daemonize = true
end
+ case @config["core.db"]
+ when "bdb"
+ require 'rbot/registry/bdb'
+ when "tc"
+ require 'rbot/registry/tc'
+ else
+ raise _("Unknown DB adaptor: %s") % @config["core.db"]
+ end
+
@logfile = @config['log.file']
if @logfile.class!=String || @logfile.empty?
logfname = File.basename(botclass).gsub(/^\.+/,'')
m = WhoisMessage.new(self, server, source, target, data[:whois])
@plugins.delegate "whois", m
}
+ @client[:list] = proc {|data|
+ source = data[:source]
+ m = ListMessage.new(self, server, source, source, data[:list])
+ @plugins.delegate "irclist", m
+ }
@client[:join] = proc {|data|
m = JoinMessage.new(self, server, data[:source], data[:channel], data[:message])
sendq("MODE #{data[:channel]}", nil, 0) if m.address?
m.users = data[:users]
@plugins.delegate "names", m
}
+ @client[:banlist] = proc { |data|
+ m = BanlistMessage.new(self, server, server, data[:channel])
+ m.bans = data[:bans]
+ @plugins.delegate "banlist", m
+ }
+ @client[:nosuchtarget] = proc { |data|
+ m = NoSuchTargetMessage.new(self, server, server, data[:target], data[:message])
+ @plugins.delegate "nosuchtarget", m
+ }
@client[:error] = proc { |data|
raise ServerError, data[:message]
}
missing = Dir.chdir(template_dir) { Dir.glob('*/**') } - Dir.chdir(@botclass) { Dir.glob('*/**') }
missing.map do |f|
dest = File.join(@botclass, f)
- FileUtils.mkdir_p(File.dirname dest)
+ FileUtils.mkdir_p(File.dirname(dest))
FileUtils.cp File.join(template_dir, f), dest
end
else
}
end
@default_send_options.update opts unless opts.empty?
- end
+ end
# checks if we should be quiet on a channel
def quiet_on?(channel)
# connect the bot to IRC
def connect
+ # make sure we don't have any spurious ping checks running
+ # (and initialize the vars if this is the first time we connect)
+ stop_server_pings
begin
quit if $interrupted > 0
@socket.connect
@last_rec = Time.now
- rescue => e
- raise e.class, "failed to connect to IRC server at #{@socket.server_uri}: " + e
+ rescue Exception => e
+ uri = @socket.server_uri || '<unknown>'
+ error "failed to connect to IRC server at #{uri}"
+ error e
+ raise
end
quit if $interrupted > 0
disconnect(message)
end
- if will_wait
- log "\n\nDisconnected\n\n"
+ begin
+ if will_wait
+ log "\n\nDisconnected\n\n"
- quit if $interrupted > 0
+ quit if $interrupted > 0
- log "\n\nWaiting to reconnect\n\n"
- sleep @config['server.reconnect_wait']
- sleep 10*@config['server.reconnect_wait'] if too_fast
- end
+ log "\n\nWaiting to reconnect\n\n"
+ sleep @config['server.reconnect_wait']
+ sleep 10*@config['server.reconnect_wait'] if too_fast
+ end
- connect
+ connect
+ rescue Exception => e
+ will_wait = true
+ retry
+ end
end
# begin event handling loop
def mainloop
while true
too_fast = false
+ quit_msg = nil
begin
- quit_msg = nil
reconnect(quit_msg, too_fast)
quit if $interrupted > 0
while @socket.connected?
quit_msg = "server ERROR: " + e.message
too_fast = e.message.index("reconnect too fast")
retry
- rescue BDB::Fatal => e
- fatal "fatal bdb error: #{e.pretty_inspect}"
+ rescue DBFatal => e
+ fatal "fatal db error: #{e.pretty_inspect}"
DBTree.stats
# Why restart? DB problems are serious stuff ...
# restart("Oops, we seem to have registry problems ...")
projects / user / henk / code / ruby / rbot.git / blobdiff