tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add logging of S3-related errors (#16381)

Browse Source
This commit is contained in:
Claire
2021-07-21 18:34:39 +02:00
committed by GitHub
parent c1d62c4c01
commit d8629e7b86
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/api/base_controller.rb
View File

@ -40,7 +40,12 @@ class Api::BaseController < ApplicationController
render json: { error: 'This action is not allowed' }, status: 403
end
rescue_from Mastodon::RaceConditionError, Seahorse::Client::NetworkingError, Stoplight::Error::RedLight do
rescue_from Seahorse::Client::NetworkingError do |e|
Rails.logger.warn "Storage server error: #{e}"
render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
end
rescue_from Mastodon::RaceConditionError, Stoplight::Error::RedLight do
render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
end