diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-12 01:51:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 01:51:12 +0200 |
| commit | 16cdaa1110878f84a542f0f9a6b323ba800f4e81 (patch) | |
| tree | 39f7e0a92b3a46f949a9e860a2a241fb64c484ab /app/controllers/media_proxy_controller.rb | |
| parent | 3a3b40e0c36902b66526303af8d5fdecb8bab5c2 (diff) | |
Fix uncaught errors in media proxy controller (#11811)
Diffstat (limited to 'app/controllers/media_proxy_controller.rb')
| -rw-r--r-- | app/controllers/media_proxy_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index 558cd6e30..47544f21c 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -8,6 +8,8 @@ class MediaProxyController < ApplicationController before_action :authenticate_user!, if: :whitelist_mode? rescue_from ActiveRecord::RecordInvalid, with: :not_found + rescue_from Mastodon::UnexpectedResponseError, with: :not_found + rescue_from HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, with: :internal_server_error def show RedisLock.acquire(lock_options) do |lock| |