Download as
Browse Code »

Commit 64b73a348a316646d3445a65ece9920c9b76d508

Authored by Victor Costa
1 parent bd55ad60
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Avoid loop in person notification job

Showing 2 changed files with 18 additions and 2 deletions   Show diff stats
app/models/person_notifier.rb
  Diff comments   View file @64b73a3
... ... @@ -59,8 +59,12 @@ class PersonNotifier
59 59 end
60 60  
61 61 def failure(job)
62   - person = Person.find(person_id)
63   - person.notifier.dispatch_notification_mail
  62 + begin
  63 + person = Person.find(person_id)
  64 + person.notifier.dispatch_notification_mail
  65 + rescue
  66 + Rails.logger.error "PersonNotifier::NotifyJob: Cannot recover from failure"
  67 + end
64 68 end
65 69  
66 70 end
... ...
test/unit/person_notifier_test.rb
  Diff comments   View file @64b73a3
... ... @@ -234,6 +234,18 @@ class PersonNotifierTest < ActiveSupport::TestCase
234 234 assert_match /src="http:\/\/.*\/images\/icons-app\/community-icon.png.*"/, sent.body.to_s
235 235 end
236 236  
  237 + should 'do not raise errors in NotifyJob failure to avoid loop' do
  238 + Delayed::Worker.max_attempts = 1
  239 + Delayed::Job.enqueue(PersonNotifier::NotifyJob.new(@member.id))
  240 +
  241 + PersonNotifier.any_instance.stubs(:notify).raises('error')
  242 + PersonNotifier.any_instance.stubs(:dispatch_notification_mail).raises('error')
  243 +
  244 + process_delayed_job_queue
  245 + jobs = PersonNotifier::NotifyJob.find(@member.id)
  246 + assert jobs.select {|j| !j.failed? && j.last_error.nil? }.empty?
  247 + end
  248 +
237 249 private
238 250  
239 251 def notify
... ...