Download as
Browse Code »

Commit 833e001202e00dccf0709b670c0df231b0bac97f

Authored by Antonio Terceiro
2 parents 67ae703f c448138a
Exists in staging and in 37 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, comments_permissions, 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_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

Merge branch 'fix-feed-never-fetched' into 'master' 

Fix feed that has never been fetched succesfully

This avoid a crash when container.fetched_at is `nil`.

See merge request !782
Showing 2 changed files with 17 additions and 1 deletions   Show diff stats
lib/feed_handler.rb
  Diff comments   View file @833e001
@@ -53,7 +53,7 @@ class FeedHandler @@ -53,7 +53,7 @@ class FeedHandler
53 def process(container) 53 def process(container)
54 begin 54 begin
55 container.class.transaction do 55 container.class.transaction do
56 - if container.update_errors > FeedHandler.max_errors && container.fetched_at < (Time.now - FeedHandler.disabled_period) 56 + if failed_too_many_times(container) && enough_time_since_last_failure(container)
57 container.enabled = true 57 container.enabled = true
58 container.update_errors = 0 58 container.update_errors = 0
59 container.save 59 container.save
@@ -103,4 +103,12 @@ class FeedHandler @@ -103,4 +103,12 @@ class FeedHandler
103 url =~ URI.regexp('http') || url =~ URI.regexp('https') 103 url =~ URI.regexp('http') || url =~ URI.regexp('https')
104 end 104 end
105 105
  106 + def failed_too_many_times(container)
  107 + container.update_errors > FeedHandler.max_errors
  108 + end
  109 +
  110 + def enough_time_since_last_failure(container)
  111 + container.fetched_at.nil? || container.fetched_at < (Time.now - FeedHandler.disabled_period)
  112 + end
  113 +
106 end 114 end
test/unit/feed_handler_test.rb
  Diff comments   View file @833e001
@@ -132,6 +132,14 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase @@ -132,6 +132,14 @@ class FeedHandlerTest &lt; ActiveSupport::TestCase
132 132
133 assert container.enabled, 'must reenable container after <disabled_period> (%s)' % container_class 133 assert container.enabled, 'must reenable container after <disabled_period> (%s)' % container_class
134 end 134 end
  135 +
  136 + should "handle a feed that was never fetched successfully (#{container_class})" do
  137 + container = create(container_class)
  138 + container.update_errors = FeedHandler.max_errors + 1
  139 + container.fetched_at = nil
  140 + handler.expects(:actually_process_container).with(container)
  141 + handler.process(container)
  142 + end
135 end 143 end
136 144
137 should 'not crash even when finish fetch fails' do 145 should 'not crash even when finish fetch fails' do