gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Fix uncaught errors in media proxy controller (#11811)

gh/stable
Eugen Rochko 2019-09-12 01:51:12 +02:00 committed by GitHub
parent 3a3b40e0c3
commit 16cdaa1110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/media_proxy_controller.rb
View File

@ -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|