Commit 16cdaa11 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub

Fix uncaught errors in media proxy controller (#11811)

parent 3a3b40e0
...@@ -8,6 +8,8 @@ class MediaProxyController < ApplicationController ...@@ -8,6 +8,8 @@ class MediaProxyController < ApplicationController
before_action :authenticate_user!, if: :whitelist_mode? before_action :authenticate_user!, if: :whitelist_mode?
rescue_from ActiveRecord::RecordInvalid, with: :not_found 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 def show
RedisLock.acquire(lock_options) do |lock| RedisLock.acquire(lock_options) do |lock|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment