diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2017-07-14 17:29:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 17:29:53 -0400 |
| commit | c178de536e6aca386a506dcebda3d427d3d7b487 (patch) | |
| tree | dea7801cf3ee79bac01e51e3e92e16d3f3689e05 /lib/active_storage | |
| parent | 52cfe86dce45da2f69df7c4f92955d8ee375cfc3 (diff) | |
| parent | ed977c32e07a7bac82f08e66162e4ce95769d263 (diff) | |
| download | rails-c178de536e6aca386a506dcebda3d427d3d7b487.tar.gz rails-c178de536e6aca386a506dcebda3d427d3d7b487.tar.bz2 rails-c178de536e6aca386a506dcebda3d427d3d7b487.zip | |
Merge pull request #53 from colorfulfool/error-messages
Useful error messages for two possible misconfigurations
Diffstat (limited to 'lib/active_storage')
| -rw-r--r-- | lib/active_storage/engine.rb | 3 | ||||
| -rw-r--r-- | lib/active_storage/storage_services.yml | 4 |
2 files changed, 5 insertions, 2 deletions
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 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 |