major restructuring, specs probably all break

right now

lib/amqp/failover_client.rb

@@ -4,25 +4,24 @@ module AMQP
   module FailoverClient
     include AMQP::BasicClient
     
-    attr_accessor :on_disconnect
+    attr_accessor :failover
+    attr_reader :fallback_monitor
+    
     attr_accessor :settings
+    attr_accessor :on_disconnect
     
     def self.extended(base)
-      base.on_disconnect = proc {
-        Failover::OnDisconnect.new(base).call
-      }
+      if (base.failover = base.settings.delete(:failover))
+        base.on_disconnect = base.method(:failover_leap)
+      end
     end
     
     def logger
-      @logger ||= Failover::Logger.new
-    end
-    
-    def failover_conf
-      @failover_conf ||= Failover::Config.new
+      Failover.logger
     end
     
     def configs
-      failover_conf.configs
+      @failover.configs if @failover
     end
     
     def clean_exit(msg = nil)
@@ -32,20 +31,50 @@ module AMQP
       Process.exit
     end
     
-    def process_frame(frame)
-      if mq = channels[frame.channel]
-        mq.process_frame(frame)
-        return
+    def failover_leap
+      if (new_settings = @failover.from(@settings))
+        log_message = "Could not connect to or lost connection to server #{@settings[:host]}:#{@settings[:port]}. " +
+                      "Attempting connection to: #{new_settings[:host]}:#{new_settings[:port]}"
+        logger.error(log_message)
+        logger.info(log_message)
+        
+        fallback(@failover.primary, @failover.fallback_interval) if @failover.primary == @settings
+        @settings = new_settings
+        reconnect
+      else
+        raise Error, "Could not connect to server #{@settings[:host]}:#{@settings[:port]}"
       end
-      
-      if frame.is_a?(AMQP::Frame::Method) && (method = frame.payload).is_a?(AMQP::Protocol::Connection::Close)
-        if method.reply_text =~ /^NOT_ALLOWED/
-          raise AMQP::Error, "#{method.reply_text} in #{::AMQP::Protocol.classes[method.class_id].methods[method.method_id]}"
-        end
-      end
-      super(frame)
     end
     
+    def fallback(conf = {}, retry_interval = nil)
+      @fallback_monitor = Failover::ServerDiscovery.monitor(conf, retry_interval) do
+        fallback_callback.call(conf, retry_interval)
+      end
+    end
+    
+    def fallback_callback
+      @fallback_callback ||= proc { |conf, retry_interval|
+        clean_exit("Primary server (#{conf[:host]}:#{conf[:port]}) is back. " +
+                   "Performing clean exit to be relaunched with primary config.")
+      }
+    end
+    attr_writer :fallback_callback
+    
+    #TODO: Figure out why I originally needed this
+    # def process_frame(frame)
+    #   if mq = channels[frame.channel]
+    #     mq.process_frame(frame)
+    #     return
+    #   end
+    #   
+    #   if frame.is_a?(AMQP::Frame::Method) && (method = frame.payload).is_a?(AMQP::Protocol::Connection::Close)
+    #     if method.reply_text =~ /^NOT_ALLOWED/
+    #       raise AMQP::Error, "#{method.reply_text} in #{::AMQP::Protocol.classes[method.class_id].methods[method.method_id]}"
+    #     end
+    #   end
+    #   super(frame)
+    # end
+    
   end # FailoverClient
 end # AMQP