diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-21 18:34:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 18:34:39 +0200 |
| commit | d8629e7b86b6fcaedc8b31de57dd95e85fe4fb04 (patch) | |
| tree | 4fc0bb6430390920983d7b02c56fa68e48f21b84 /app/controllers/application_controller.rb | |
| parent | c1d62c4c01900daaac58ccd53dc133d66d2a2e06 (diff) | |
Add logging of S3-related errors (#16381)
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b4fb83661..3d2f8280b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -26,7 +26,12 @@ class ApplicationController < ActionController::Base rescue_from Mastodon::RateLimitExceededError, with: :too_many_requests rescue_from HTTP::Error, OpenSSL::SSL::SSLError, with: :internal_server_error - rescue_from Mastodon::RaceConditionError, Seahorse::Client::NetworkingError, Stoplight::Error::RedLight, ActiveRecord::SerializationFailure, with: :service_unavailable + rescue_from Mastodon::RaceConditionError, Stoplight::Error::RedLight, ActiveRecord::SerializationFailure, with: :service_unavailable + + rescue_from Seahorse::Client::NetworkingError do |e| + Rails.logger.warn "Storage server error: #{e}" + service_unavailable + end before_action :store_current_location, except: :raise_not_found, unless: :devise_controller? before_action :require_functional!, if: :user_signed_in? |