Skip to content

Commit

Permalink
Merge pull request #2383 from dmitryshagin/preserve_connection_cache
Browse files Browse the repository at this point in the history
Preserve connection cache when setting fog_credentials
  • Loading branch information
mshibuya committed Apr 30, 2019
2 parents 9b5e498 + 831b182 commit 3fda5a2
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/carrierwave/uploader/configuration.rb
Expand Up @@ -123,7 +123,9 @@ def self.eager_load_fog(fog_credentials)
# see #1198. This will hopefully no longer be necessary after fog 2.0
require self.fog_provider
require 'carrierwave/storage/fog'
Fog::Storage.new(fog_credentials) if fog_credentials.present?
if fog_credentials.present?
CarrierWave::Storage::Fog.connection_cache[fog_credentials] ||= Fog::Storage.new(fog_credentials)
end
end unless defined? eager_load_fog
def self.#{name}(value=nil)
Expand Down

0 comments on commit 3fda5a2

Please sign in to comment.