Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Neff <benjamin@coding4coffee.ch>2016-05-07 19:59:40 +0300
committerBenjamin Neff <benjamin@coding4coffee.ch>2016-06-26 07:20:59 +0300
commitd55be67df17d303419d1d906f40e0556c6652246 (patch)
tree412e6b37952e53e0435c7926fb54455a4738d7b3 /app/workers
parentf3466bcfd6955048e75d38ede590fc6a741e8ce7 (diff)
handle existing guids on receive
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/receive_base.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/workers/receive_base.rb b/app/workers/receive_base.rb
index 1fbccefa6..e2ccc8690 100644
--- a/app/workers/receive_base.rb
+++ b/app/workers/receive_base.rb
@@ -20,15 +20,13 @@ module Workers
DiasporaFederation::Salmon::InvalidAlgorithm,
DiasporaFederation::Salmon::InvalidEncoding,
Diaspora::Federation::AuthorIgnored,
+ Diaspora::Federation::InvalidAuthor,
# TODO: deprecated
DiasporaFederation::Salmon::MissingMagicEnvelope,
DiasporaFederation::Salmon::MissingAuthor,
DiasporaFederation::Salmon::MissingHeader,
DiasporaFederation::Salmon::InvalidHeader => e
logger.warn "don't retry for error: #{e.class}"
- rescue ActiveRecord::RecordInvalid => e
- logger.warn "failed to save received object: #{e.record.errors.full_messages}"
- raise e unless e.message.include? "already been taken"
end
end
end