+# encoding: UTF-8
#-- vim:sw=2:et
#++
#
when String
str = message
else
- str = message.pretty_inspect
+ str = message.pretty_inspect rescue '?'
end
qmsg = Array.new
str.each_line { |l|
Config.register Config::BooleanValue.new('server.ssl',
:default => false, :requires_restart => true, :wizard => true,
:desc => "Use SSL to connect to this server?")
+ Config.register Config::BooleanValue.new('server.ssl_verify',
+ :default => false, :requires_restart => true,
+ :desc => "Verify the SSL connection?",
+ :wizard => true)
+ Config.register Config::StringValue.new('server.ssl_ca_file',
+ :default => default_ssl_ca_file, :requires_restart => true,
+ :desc => "The CA file used to verify the SSL connection.",
+ :wizard => true)
+ Config.register Config::StringValue.new('server.ssl_ca_path',
+ :default => '', :requires_restart => true,
+ :desc => "Alternativly a directory that includes CA PEM files used to verify the SSL connection.",
+ :wizard => true)
Config.register Config::StringValue.new('server.password',
:default => false, :requires_restart => true,
:desc => "Password for connecting to this server (if required)",
debug "server.list is now #{@config['server.list'].inspect}"
end
- @socket = Irc::Socket.new(@config['server.list'], @config['server.bindhost'], :ssl => @config['server.ssl'], :penalty_pct =>@config['send.penalty_pct'])
+ @socket = Irc::Socket.new(@config['server.list'], @config['server.bindhost'],
+ :ssl => @config['server.ssl'],
+ :ssl_verify => @config['server.ssl_verify'],
+ :ssl_ca_file => @config['server.ssl_ca_file'],
+ :ssl_ca_path => @config['server.ssl_ca_path'],
+ :penalty_pct => @config['send.penalty_pct'])
@client = Client.new
@plugins.scan
:purge_split => @config['send.purge_split'],
:truncate_text => @config['send.truncate_text'].dup
- trap_sigs
+ trap_signals
+ end
+
+ # Determine (if possible) a valid path to a CA certificate bundle.
+ def default_ssl_ca_file
+ [ '/etc/ssl/certs/ca-certificates.crt', # Ubuntu/Debian
+ '/etc/ssl/certs/ca-bundle.crt', # Amazon Linux
+ '/etc/ssl/ca-bundle.pem', # OpenSUSE
+ '/etc/pki/tls/certs/ca-bundle.crt' # Fedora/RHEL
+ ].find do |file|
+ File.readable? file
+ end
end
def repopulate_botclass_directory
end
# things to do when we receive a signal
- def got_sig(sig, func=:quit)
+ def handle_signal(sig)
+ func = case sig
+ when 'SIGHUP'
+ :restart
+ when 'SIGUSR1'
+ :reconnect
+ else
+ :quit
+ end
debug "received #{sig}, queueing #{func}"
# this is not an interruption if we just need to reconnect
$interrupted += 1 unless func == :reconnect
end
# trap signals
- def trap_sigs
+ def trap_signals
begin
- trap("SIGINT") { got_sig("SIGINT") }
- trap("SIGTERM") { got_sig("SIGTERM") }
- trap("SIGHUP") { got_sig("SIGHUP", :restart) }
- trap("SIGUSR1") { got_sig("SIGUSR1", :reconnect) }
+ %w(SIGINT SIGTERM SIGHUP SIGUSR1).each do |sig|
+ trap(sig) { Thread.new { handle_signal sig } }
+ end
rescue ArgumentError => e
debug "failed to trap signals (#{e.pretty_inspect}): running on Windows?"
rescue Exception => e
end
# disconnect the bot from IRC, if connected, and then connect (again)
- def reconnect(message=nil, too_fast=false)
+ def reconnect(message=nil, too_fast=0)
# we will wait only if @last_rec was not nil, i.e. if we were connected or
# got disconnected by a network error
# if someone wants to manually call disconnect() _and_ reconnect(), they
log "\n\nWaiting to reconnect\n\n"
sleep @config['server.reconnect_wait']
- sleep 10*@config['server.reconnect_wait'] if too_fast
+ if too_fast > 0
+ tf = too_fast*@config['server.reconnect_wait']
+ tfu = Utils.secs_to_string(tf)
+ log "Will sleep for an extra #{tf}s (#{tfu})"
+ sleep tf
+ end
end
connect
+ rescue SystemExit
+ log_session_end
+ exit 0
+ rescue DBFatal => e
+ fatal "fatal db error: #{e.pretty_inspect}"
+ DBTree.stats
+ log_session_end
+ exit 2
rescue Exception => e
+ error e
will_wait = true
retry
end
# begin event handling loop
def mainloop
while true
- too_fast = false
+ too_fast = 0
quit_msg = nil
+ valid_recv = false # did we receive anything (valid) from the server yet?
begin
reconnect(quit_msg, too_fast)
quit if $interrupted > 0
+ valid_recv = false
while @socket.connected?
quit if $interrupted > 0
break unless reply = @socket.gets
@last_rec = Time.now
@client.process reply
+ valid_recv = true
+ too_fast = 0
else
ping_server
end
rescue Errno::ETIMEDOUT, Errno::ECONNABORTED, TimeoutError, SocketError => e
error "network exception: #{e.pretty_inspect}"
quit_msg = e.to_s
+ too_fast += 10 if valid_recv
+ rescue ServerMessageParseError => e
+ # if the bot tried reconnecting too often, we can get forcefully
+ # disconnected by the server, while still receiving an empty message
+ # wait at least 10 minutes in this case
+ if e.message.empty?
+ oldtf = too_fast
+ too_fast = [too_fast, 300].max
+ too_fast*= 2
+ log "Empty message from server, extra delay multiplier #{oldtf} -> #{too_fast}"
+ end
+ quit_msg = "Unparseable Server Message: #{e.message.inspect}"
+ retry
rescue ServerError => e
- # received an ERROR from the server
quit_msg = "server ERROR: " + e.message
- too_fast = e.message.index("reconnect too fast")
+ debug quit_msg
+ idx = e.message.index("connect too fast")
+ debug "'connect too fast' @ #{idx}"
+ if idx
+ oldtf = too_fast
+ too_fast += (idx+1)*2
+ log "Reconnecting too fast, extra delay multiplier #{oldtf} -> #{too_fast}"
+ end
+ idx = e.message.index(/a(uto)kill/i)
+ debug "'autokill' @ #{idx}"
+ if idx
+ # we got auto-killed. since we don't have an easy way to tell
+ # if it's permanent or temporary, we just set a rather high
+ # reconnection timeout
+ oldtf = too_fast
+ too_fast += (idx+1)*5
+ log "Killed by server, extra delay multiplier #{oldtf} -> #{too_fast}"
+ end
retry
rescue DBFatal => e
fatal "fatal db error: #{e.pretty_inspect}"
save
debug "\tcleaning up ..."
@save_mutex.synchronize do
- @plugins.cleanup
+ begin
+ @plugins.cleanup
+ rescue
+ debug "\tignoring cleanup error: #{$!}"
+ end
end
# debug "\tstopping timers ..."
# @timer.stop
projects / user / henk / code / ruby / rbot.git / blobdiff