nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2667 from MrZYX/faraday_timeout

Browse source 
set faradays timeout to 25 seconds [ci skip]
This commit is contained in:
Daniel Grippi 2012-01-14 18:17:30 -08:00
commit 78978f051e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/initializers/faraday.rb
View file

@ -1,7 +1,7 @@
# 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|