diff --git a/Changelog.md b/Changelog.md index a531e0b94510f2791c0628a2c54526ad91ce1f73..9a2a53faf7bd7f1a1d8a4b3d63b4977eae922f14 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,7 +6,7 @@ * Dropped db/seeds.rb [#5896](https://github.com/diaspora/diaspora/pull/5896) * Drop broken install scripts [#5907](https://github.com/diaspora/diaspora/pull/5907) * Improve invoking mobile site in the testsuite [#5915](https://github.com/diaspora/diaspora/pull/5915) -* Do not retry a couple of unrecoverable job failures [#5938](https://github.com/diaspora/diaspora/pull/5938) +* Do not retry a couple of unrecoverable job failures [#5938](https://github.com/diaspora/diaspora/pull/5938) [#5942](https://github.com/diaspora/diaspora/pull/5943) ## Bug fixes * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846) diff --git a/app/workers/base.rb b/app/workers/base.rb index 25ceadaa3598772c9d9ce756fe11a28a90cbca96..9165da7a95999d59e25e7db91ce4f022874b2b35 100644 --- a/app/workers/base.rb +++ b/app/workers/base.rb @@ -21,7 +21,10 @@ module Workers 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}") - raise e unless e.message.match(/already been taken/) + raise e unless %w( + "already been taken" + "is ignored by the post author" + ).any? {|reason| e.message.include? reason } rescue ActiveRecord::RecordNotUnique => e Rails.logger.info("failed to save received object: #{e.message}") raise e unless %w(