Update Faraday options passing for compatibility 0.9.2

geoblacklight · Oct 17, 2015 · ffc09b3 · ffc09b3
1 parent d62f4f0
commit ffc09b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/lib/geoblacklight/download.rb b/lib/geoblacklight/download.rb
@@ -63,10 +63,8 @@ def initiate_download
       conn = Faraday.new(url: url)
       conn.get do |request|
         request.params = @options[:request_params]
-        request.options = {
-          timeout: timeout,
-          open_timeout: timeout
-        }
+        request.options.timeout = timeout
+        request.options.open_timeout = timeout
       end
     rescue Faraday::Error::ConnectionFailed => error
       raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: 'Download connection failed', url: conn.url_prefix.to_s

diff --git a/lib/geoblacklight/wms_layer.rb b/lib/geoblacklight/wms_layer.rb
@@ -23,10 +23,8 @@ def request_response
         conn = Faraday.new(url: url)
         conn.get do |request|
           request.params = search_params
-          request.options = {
-            timeout: Settings.TIMEOUT_WMS,
-            open_timeout: Settings.TIMEOUT_WMS
-          }
+          request.options.timeout = Settings.TIMEOUT_WMS
+          request.options.open_timeout = Settings.TIMEOUT_WMS
         end
       rescue Faraday::Error::ConnectionFailed => error
         Geoblacklight.logger.error error.inspect