diff options
| author | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
| commit | 73f4af117fc5b5e4ee3337d634f5e589a9353644 (patch) | |
| tree | 62b0443573ba5038fd45aa14d4243dfc832c060a /app/controllers/media_proxy_controller.rb | |
| parent | 849e2bc4ca11892e701835a4696904d78b1ad325 (diff) | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
Merge branch 'glitch' into production
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| |