Browse Source

Fix uncaught errors in media proxy controller (#11811)

pull/4/head
Eugen Rochko 4 years ago
committed by GitHub
parent
commit
16cdaa1110
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      app/controllers/media_proxy_controller.rb

+ 2
- 0
app/controllers/media_proxy_controller.rb View File

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

Loading…
Cancel
Save