X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fircsocket.rb;h=4c6c74bb9e0140d70d288fd7f88266a6f40aface;hb=d4ebd66d357b9200edabd1f6d4fa1b3c72d048e6;hp=5163e0ef8fb3127dce665d8d851560ee97a43707;hpb=b970f0d43f6bf69e4aec75120a9bf27b412ec331;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/lib/rbot/ircsocket.rb b/lib/rbot/ircsocket.rb
index 5163e0ef..4c6c74bb 100644
--- a/lib/rbot/ircsocket.rb
+++ b/lib/rbot/ircsocket.rb
@@ -262,6 +262,9 @@ module Irc
     # 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)
@@ -278,17 +281,15 @@ module Irc
         @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
@@ -327,18 +328,25 @@ module Irc
         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'
@@ -360,9 +368,9 @@ module Irc
         @sendq_delay = newfreq
         if newfreq == 0
           clearq
-          @timer.stop
+          @timer.block(@act_id)
         else
-          @timer.start
+          @timer.unblock(@act_id)
         end
       end
     end
@@ -385,13 +393,12 @@ module Irc
       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)
@@ -406,7 +413,7 @@ module Irc
         reply.strip! if reply
         debug "RECV: #{reply.inspect}"
         return reply
-      rescue => e
+      rescue Exception => e
         handle_socket_error(:RECV, e)
       end
     end
@@ -415,7 +422,7 @@ module Irc
       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
@@ -429,7 +436,7 @@ module Irc
         begin
           debug "in spooler"
           if @sendq.empty?
-            @timer.stop
+            @timer.block(@act_id)
             return
           end
           now = Time.new
@@ -439,7 +446,7 @@ module Irc
           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
@@ -449,11 +456,11 @@ module Irc
             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
@@ -485,13 +492,13 @@ module Irc
       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
@@ -510,7 +517,7 @@ module Irc
           @lines_sent += 1
           @burst += 1
         end
-      rescue => e
+      rescue Exception => e
         handle_socket_error(:SEND, e)
       end
     end