From 62e5562edb72f591c6af4c4da2bce3db18b5ba36 Mon Sep 17 00:00:00 2001 From: colorfulfool Date: Sat, 15 Jul 2017 00:25:07 +0300 Subject: Don't fail on boot because of missing S3 keys when S3 is not used --- lib/active_storage/storage_services.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/active_storage') diff --git a/lib/active_storage/storage_services.yml b/lib/active_storage/storage_services.yml index a93304d88f..c80a3e8453 100644 --- a/lib/active_storage/storage_services.yml +++ b/lib/active_storage/storage_services.yml @@ -9,8 +9,8 @@ local: # Use rails secrets:edit to set the AWS secrets (as shared:aws:access_key_id|secret_access_key) amazon: service: S3 - access_key_id: <%= Rails.application.secrets.aws[:access_key_id] %> - secret_access_key: <%= Rails.application.secrets.aws[:secret_access_key] %> + access_key_id: <%= Rails.application.secrets.dig(:aws, :access_key_id) %> + secret_access_key: <%= Rails.application.secrets.dig(:aws, :secret_access_key) %> region: us-east-1 bucket: your_own_bucket -- cgit v1.2.3 From ed977c32e07a7bac82f08e66162e4ce95769d263 Mon Sep 17 00:00:00 2001 From: colorfulfool Date: Sat, 15 Jul 2017 00:25:43 +0300 Subject: Fail early if no storage service is specified --- lib/active_storage/engine.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/active_storage') diff --git a/lib/active_storage/engine.rb b/lib/active_storage/engine.rb index c251f522c6..5f0b62809e 100644 --- a/lib/active_storage/engine.rb +++ b/lib/active_storage/engine.rb @@ -56,6 +56,9 @@ module ActiveStorage rescue => e raise e, "Cannot load `Rails.config.active_storage.service`:\n#{e.message}", e.backtrace end + else + raise "No storage service specified for current env (#{Rails.env}). " \ + "Add config.active_storage.service = :local into your config/environments/#{Rails.env}.rb." end end end -- cgit v1.2.3