diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-25 14:31:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 14:31:49 +0200 |
| commit | 359f8de2e8297670fe9faf0839c8c9dd25b58de1 (patch) | |
| tree | 1edfdc513b197699b5e7cae76d8c4871d5019788 /app/controllers/application_controller.rb | |
| parent | a2df067f9852f0db3140dd2c35539f4e74bdb6dc (diff) | |
| parent | 2f6ff141984e7df12f7bcc64b2c8754542151a70 (diff) | |
Merge pull request #1570 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 9eb73d576..7c36bc6b8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -27,7 +27,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? |