Download as
Browse Code »

Commit 7fe595f02515b365abde342489c479764b3741c6

Authored by Daniela Feitosa
2 parents be6e8532 30bcf289
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge commit 'refs/merge-requests/14' of git://gitorious.org/noosfero/noosfero i… 

…nto merge-requests/14
Showing 2 changed files with 13 additions and 1 deletions   Show diff stats
lib/feed_handler.rb
  Diff comments   View file @7fe595f
... ... @@ -65,7 +65,12 @@ class FeedHandler
65 65 if container.update_errors > FeedHandler.max_errors
66 66 container.enabled = false
67 67 end
68   - container.finish_fetch
  68 + begin
  69 + container.finish_fetch
  70 + rescue Exception => finish_fetch_exception
  71 + RAILS_DEFAULT_LOGGER.warn("Unable to finish fetch from %s ID %d\n%s" % [container.class.name, container.id, finish_fetch_exception.to_s])
  72 + RAILS_DEFAULT_LOGGER.warn("Backtrace:\n%s" % finish_fetch_exception.backtrace.join("\n"))
  73 + end
69 74 end
70 75 end
71 76  
... ...
test/unit/feed_handler_test.rb
  Diff comments   View file @7fe595f
... ... @@ -114,4 +114,11 @@ class FeedHandlerTest < Test::Unit::TestCase
114 114 end
115 115 end
116 116  
  117 + should 'not crash even when finish fetch fails' do
  118 + container.stubs(:finish_fetch).raises(Exception.new("crash"))
  119 + assert_nothing_raised do
  120 + handler.process(container)
  121 + end
  122 + end
  123 +
117 124 end
... ...