Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve connection cache when setting fog_credentials #2383

Merged
merged 1 commit into from Apr 30, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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