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>2015-05-26 05:44:10 +0300
committerDennis Schubert <mail@dennis-schubert.de>2015-05-28 02:34:24 +0300
commit21ae93e6583850cee2ac9581ddcf28cbac9298eb (patch)
tree89f25e7419596a2cf63090fa18992ce0486519ca /app/workers
parent6206bb9920dff6939676e51ae55382d5a143e2a8 (diff)
handle when the diaspora xml parser returns nil
closes #5991
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/workers/base.rb b/app/workers/base.rb
index ab506eb2c..2a614663e 100644
--- a/app/workers/base.rb
+++ b/app/workers/base.rb
@@ -17,7 +17,8 @@ module Workers
Diaspora::AuthorXMLAuthorMismatch,
# We received a private object to our public endpoint, again something
# Friendica seems to provoke
- Diaspora::NonPublic => e
+ Diaspora::NonPublic,
+ Diaspora::XMLNotParseable => e
Rails.logger.info("error on receive: #{e.class}")
rescue ActiveRecord::RecordInvalid => e
Rails.logger.info("failed to save received object: #{e.record.errors.full_messages}")