# all incoming data and @filter.out(data) for all outgoing data
attr_reader :filter
+ # normalized uri of the current server
+ attr_reader :server_uri
+
# default trivial filter class
class IdentityFilter
def in(x)
@filter = f || IdentityFilter.new
end
- # server:: server to connect to
- # port:: IRCd port
+ # server_list:: list of servers to connect to
# host:: optional local host to bind to (ruby 1.7+ required)
# create a new IrcSocket
- def initialize(server, port, host, sendq_delay=2, sendq_burst=4, opts={})
- @timer = Timer::Timer.new
- @timer.add(0.2) do
- spool
- end
- @server = server.dup
- @port = port.to_i
+ def initialize(server_list, host, sendq_delay=2, sendq_burst=4, opts={})
+ @timer = Timer.new
+ @act_id = @timer.add(0.2, :blocked => true) { spool }
+ @server_list = server_list.dup
+ @server_uri = nil
+ @conn_count = 0
@host = host
@sock = nil
@filter = IdentityFilter.new
warning "reconnecting while connected"
return
end
+ srv_uri = @server_list[@conn_count % @server_list.size].dup
+ srv_uri = 'irc://' + srv_uri if !(srv_uri =~ /:\/\//)
+ @conn_count += 1
+ @server_uri = URI.parse(srv_uri)
+ @server_uri.port = 6667 if !@server_uri.port
+ debug "connection attempt \##{@conn_count} (#{@server_uri.host}:#{@server_uri.port})"
+
if(@host)
begin
- @sock=TCPSocket.new(@server, @port, @host)
+ @sock=TCPSocket.new(@server_uri.host, @server_uri.port, @host)
rescue ArgumentError => e
error "Your version of ruby does not support binding to a "
error "specific local address, please upgrade if you wish "
error "to use HOST = foo"
error "(this option has been disabled in order to continue)"
- @sock=TCPSocket.new(@server, @port)
+ @sock=TCPSocket.new(@server_uri.host, @server_uri.port)
end
else
- @sock=TCPSocket.new(@server, @port)
+ @sock=TCPSocket.new(@server_uri.host, @server_uri.port)
end
if(@ssl)
require 'openssl'
@sendq_delay = newfreq
if newfreq == 0
clearq
- @timer.stop
+ @timer.block(@act_id)
else
- @timer.start
+ @timer.unblock(@act_id)
end
end
end
end
end
- def handle_socket_error(string, err)
- error "#{string} failed: #{err.inspect}"
- debug err.backtrace.join("\n")
+ def handle_socket_error(string, e)
+ error "#{string} failed: #{e.pretty_inspect}"
# We assume that an error means that there are connection
# problems and that we should reconnect, so we
shutdown
- raise SocketError.new(err.inspect)
+ raise SocketError.new(e.inspect)
end
# get the next line from the server (blocks)
reply.strip! if reply
debug "RECV: #{reply.inspect}"
return reply
- rescue => e
+ rescue Exception => e
handle_socket_error(:RECV, e)
end
end
if @sendq_delay > 0
@qmutex.synchronize do
@sendq.push msg, chan, ring
- @timer.start
+ @timer.unblock(@act_id)
end
else
# just send it if queueing is disabled
begin
debug "in spooler"
if @sendq.empty?
- @timer.stop
+ @timer.block(@act_id)
return
end
now = Time.new
elsif (@burst > @sendq_burst)
# nope. can't send anything, come back to us next tick...
debug "can't send yet"
- @timer.start
+ @timer.unblock(@act_id)
return
end
@flood_send = now if @flood_send < now
puts_critical(@sendq.shift, true)
end
if @sendq.empty?
- @timer.stop
+ @timer.block(@act_id)
end
- rescue => e
- error "Spooling failed: #{e.inspect}"
- error e.backtrace.join("\n")
+ rescue Exception => e
+ error "Spooling failed: #{e.pretty_inspect}"
+ raise e
end
end
end
return unless connected?
begin
@sock.close
- rescue => err
- error "error while shutting down: #{err.inspect}"
- debug err.backtrace.join("\n")
+ rescue Exception => e
+ error "error while shutting down: #{e.pretty_inspect}"
end
@rawsock = nil if @ssl
@sock = nil
@burst = 0
+ @sendq.clear
end
private
@lines_sent += 1
@burst += 1
end
- rescue => e
+ rescue Exception => e
handle_socket_error(:SEND, e)
end
end