Commit 78978f05 authored by Daniel Grippi's avatar Daniel Grippi

Merge pull request #2667 from MrZYX/faraday_timeout

set faradays timeout to 25 seconds [ci skip]
parents 9d2b1e94 bec3e2c9
# Copyright (c) 2010-2011, Diaspora Inc. This file is # Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
options = {:timeout => 5} options = {:timeout => 25}
options[:ssl] = {:ca_file => EnviromentConfiguration.ca_cert_file_location} options[:ssl] = {:ca_file => EnviromentConfiguration.ca_cert_file_location}
Faraday.default_connection = Faraday::Connection.new(options) do |b| Faraday.default_connection = Faraday::Connection.new(options) do |b|
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment