diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-12-15 12:55:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 12:55:29 +0100 |
| commit | 1045549f85041b13002801808b30a332c3a68c61 (patch) | |
| tree | 1ef1f377ee973a8b2ef69b0bf3fc4683d03f2ec5 /app/lib/activitypub | |
| parent | 75d2762fdf600de6785f612caf182b32064a9bf6 (diff) | |
Add stoplight for object storage failures, return HTTP 503 (#13043)
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index c77f237f9..612744676 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -228,6 +228,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri) emoji.image_remote_url = image_url emoji.save + rescue Seahorse::Client::NetworkingError + nil end def process_attachments @@ -250,6 +252,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity media_attachment.save rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError RedownloadMediaWorker.perform_in(rand(30..600).seconds, media_attachment.id) + rescue Seahorse::Client::NetworkingError + nil end end |