From 1cc8fac8a1a17d6b389b6f73c7293bb0284a0b01 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 11 Jan 2016 01:54:48 +0100
Subject: [PATCH] add http config to DiasporaFederation

---
 lib/diaspora_federation.rb         | 38 ++++++++++++++++++++++++++++++
 lib/diaspora_federation/fetcher.rb |  6 ++---
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/lib/diaspora_federation.rb b/lib/diaspora_federation.rb
index 0dc7e15..d500de2 100644
--- a/lib/diaspora_federation.rb
+++ b/lib/diaspora_federation.rb
@@ -33,6 +33,13 @@ module DiasporaFederation
     save_entity_after_receive
   )
 
+  # defaults
+  @http_concurrency = 20
+  @http_timeout = 30
+  @http_verbose = false
+  @http_redirect_limit = 4
+  @http_user_agent = "DiasporaFederation/#{DiasporaFederation::VERSION}"
+
   class << self
     # {Callbacks} instance with defined callbacks
     # @see Callbacks#on
@@ -53,6 +60,27 @@ module DiasporaFederation
     #   config.certificate_authorities = AppConfig.environment.certificate_authorities.get
     attr_accessor :certificate_authorities
 
+    # Maximum number of parallel HTTP requests made to other pods
+    #
+    # @example
+    #   config.http_concurrency = AppConfig.settings.typhoeus_concurrency.to_i
+    attr_accessor :http_concurrency
+
+    # timeout in seconds for http-requests
+    attr_accessor :http_timeout
+
+    # Turn on extra verbose output when sending stuff.
+    #
+    # @example
+    #   config.http_verbose = AppConfig.settings.typhoeus_verbose?
+    attr_accessor :http_verbose
+
+    # max redirects to follow
+    attr_reader :http_redirect_limit
+
+    # user agent used for http-requests
+    attr_reader :http_user_agent
+
     # configure the federation library
     #
     # @example
@@ -167,6 +195,8 @@ module DiasporaFederation
         end
       end
 
+      validate_http_config
+
       unless @callbacks.definition_complete?
         configuration_error "Missing handlers for #{@callbacks.missing_handlers.join(', ')}"
       end
@@ -176,6 +206,14 @@ module DiasporaFederation
 
     private
 
+    def validate_http_config
+      configuration_error "http_concurrency: please configure a number" unless @http_concurrency.is_a?(Fixnum)
+      configuration_error "http_timeout: please configure a number" unless @http_timeout.is_a?(Fixnum)
+
+      return unless !@http_verbose.is_a?(TrueClass) && !@http_verbose.is_a?(FalseClass)
+      configuration_error "http_verbose: please configure a boolean"
+    end
+
     def configuration_error(message)
       logger.fatal("diaspora federation configuration error: #{message}")
       raise ConfigurationError, message
diff --git a/lib/diaspora_federation/fetcher.rb b/lib/diaspora_federation/fetcher.rb
index b702aa1..a0531f9 100644
--- a/lib/diaspora_federation/fetcher.rb
+++ b/lib/diaspora_federation/fetcher.rb
@@ -25,16 +25,16 @@ module DiasporaFederation
 
     def self.create_default_connection
       options = {
-        request: {timeout: 30},
+        request: {timeout: DiasporaFederation.http_timeout},
         ssl:     {ca_file: DiasporaFederation.certificate_authorities}
       }
 
       @connection = Faraday::Connection.new(options) do |builder|
-        builder.use FaradayMiddleware::FollowRedirects, limit: 4
+        builder.use FaradayMiddleware::FollowRedirects, limit: DiasporaFederation.http_redirect_limit
         builder.adapter Faraday.default_adapter
       end
 
-      @connection.headers["User-Agent"] = "DiasporaFederation/#{DiasporaFederation::VERSION}"
+      @connection.headers["User-Agent"] = DiasporaFederation.http_user_agent
     end
     private_class_method :create_default_connection
   end