very basic failover to alternative endpoint if it exists

Author: darragh

lib/intercom.rb

@@ -58,6 +58,11 @@ def self.target_base_url
 
   def self.send_request_to_path(request)
     request.execute(target_base_url)
+  rescue Intercom::ServiceReachableError
+    if @endpoints && @endpoints.length > 1
+      @endpoints = @endpoints.rotate
+      request.execute(target_base_url)
+    end
   end
 
   def self.post(path, payload_hash)
@@ -76,7 +81,7 @@ def self.get(path, params)
     send_request_to_path(Intercom::Request.get(path, params))
   end
 
-  def self.check_required_params(params, path=nil)
+  def self.check_required_params(params, path=nil) #nodoc
     return if path.eql?("users")
     raise ArgumentError.new("Expected params Hash, got #{params.class}") unless params.is_a?(Hash)
     raise ArgumentError.new("Either email or user_id must be specified") unless params.keys.any? { |key| %W(email user_id).include?(key.to_s) }
@@ -86,23 +91,23 @@ def self.protocol #nodoc
     @protocol
   end
 
-  def self.protocol=(override)
+  def self.protocol=(override) #nodoc
     @protocol = override
   end
 
-  def self.hostname
+  def self.hostname #nodoc
     @hostname
   end
 
-  def self.hostname=(override)
+  def self.hostname=(override) #nodoc
     @hostname = override
   end
 
-  def self.endpoint=(endpoint)
+  def self.endpoint=(endpoint) #nodoc
     self.endpoints = [endpoint]
   end
 
-  def self.endpoints=(endpoints)
+  def self.endpoints=(endpoints) #nodoc
     @endpoints = endpoints
   end
 
@@ -115,6 +120,10 @@ class AuthenticationError < StandardError;
   class ServerError < StandardError;
   end
 
+  # Raised when we reach socket connect timeout
+  class ServiceReachableError < StandardError;
+  end
+
   # Raised when requesting resources on behalf of a user that doesn't exist in your application on Intercom.
   class ResourceNotFound < StandardError;
   end

lib/intercom/request.rb

@@ -51,7 +51,7 @@ def client(uri)
         net.ca_file = File.join(File.dirname(__FILE__), '../data/cacert.pem')
       end
       net.read_timeout = 30
-      net.open_timeout = 10
+      net.open_timeout = 3
       net
     end
 
@@ -64,6 +64,8 @@ def execute(target_base_url=nil)
         decoded = decode(response['content-encoding'], response.body)
         JSON.parse(decoded)
       end
+    rescue Timeout::Error
+      raise Intercom::ServiceReachableError
     end
 
     def decode(content_encoding, body)

spec/integration/intercom_api_integration_spec.rb

@@ -5,6 +5,7 @@
   before :each do
     Intercom.app_id = "dummy-app-id"
     Intercom.api_key = "dummy-secret-key"
+    Intercom.endpoint = "https://api.intercom.io"
   end
 
   it "should get all user" do
@@ -53,4 +54,11 @@
     note.html.must_equal "<p>This is a note</p>"
     note.user.email.must_equal "[email protected]"
   end
+
+  it "should failover to good endpoint when first one is un-reachable" do
+    Intercom.endpoints = ["http://127.0.0.7", "https://api.intercom.io"]
+
+    user = Intercom::User.find(:email => "[email protected]")
+    user.name.must_equal "Somebody"
+  end
 end