mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
fix logic error which prevented turning off persistent connections
This commit is contained in:
parent
a406dc6c3f
commit
4c8979e9ab
4 changed files with 16 additions and 5 deletions
|
@ -87,7 +87,10 @@ module Fog
|
||||||
@port = options[:port] || 443
|
@port = options[:port] || 443
|
||||||
@scheme = options[:scheme] || 'https'
|
@scheme = options[:scheme] || 'https'
|
||||||
@version = options[:version] || '2010-11-01'
|
@version = options[:version] || '2010-11-01'
|
||||||
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
|
unless options.has_key?(:persistent)
|
||||||
|
options[:persistent] = true
|
||||||
|
end
|
||||||
|
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
|
||||||
end
|
end
|
||||||
|
|
||||||
def reload
|
def reload
|
||||||
|
|
|
@ -92,7 +92,10 @@ module Fog
|
||||||
@port = options[:port] || 443
|
@port = options[:port] || 443
|
||||||
@scheme = options[:scheme] || 'https'
|
@scheme = options[:scheme] || 'https'
|
||||||
@version = options[:version] || '2010-10-01'
|
@version = options[:version] || '2010-10-01'
|
||||||
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
|
unless options.has_key?(:persistent)
|
||||||
|
options[:persistent] = true
|
||||||
|
end
|
||||||
|
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
|
||||||
end
|
end
|
||||||
|
|
||||||
def reload
|
def reload
|
||||||
|
|
|
@ -220,7 +220,6 @@ module Fog
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
class Real
|
class Real
|
||||||
include Utils
|
include Utils
|
||||||
extend Fog::Deprecation
|
extend Fog::Deprecation
|
||||||
|
@ -277,8 +276,11 @@ module Fog
|
||||||
@path = options[:path] || '/'
|
@path = options[:path] || '/'
|
||||||
@port = options[:port] || 443
|
@port = options[:port] || 443
|
||||||
@scheme = options[:scheme] || 'https'
|
@scheme = options[:scheme] || 'https'
|
||||||
|
unless options.has_key?(:persistent)
|
||||||
|
options[:persistent] = true
|
||||||
|
end
|
||||||
end
|
end
|
||||||
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
|
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
|
||||||
end
|
end
|
||||||
|
|
||||||
def reload
|
def reload
|
||||||
|
|
|
@ -202,7 +202,10 @@ module Fog
|
||||||
@host = options[:host] || 'commondatastorage.googleapis.com'
|
@host = options[:host] || 'commondatastorage.googleapis.com'
|
||||||
@port = options[:port] || 443
|
@port = options[:port] || 443
|
||||||
@scheme = options[:scheme] || 'https'
|
@scheme = options[:scheme] || 'https'
|
||||||
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent] || true)
|
unless options.has_key?(:persistent)
|
||||||
|
options[:persistent] = true
|
||||||
|
end
|
||||||
|
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
|
||||||
end
|
end
|
||||||
|
|
||||||
def reload
|
def reload
|
||||||
|
|
Loading…
Add table
Reference in a new issue