@@ -3,19 +3,22 @@ require File.dirname(__FILE__) + '/../app/models/rss_feed.rb' class FetchRssItems def self.fetch_one #return whether worth checking again soon + activity = nil begin - rss_feed = RssFeed.find_next_to_fetch + rss_feed = RssFeed.find_next_to_fetch! rss_feed.check_feed() + activity = "checked #{rss_feed.url}" rescue ActiveRecord::StaleObjectError #do nothing + activity = "had a conflict with another rssfeedfetcher" rescue ActiveRecord::RecordNotFound #not worth checking again for a while - return false rescue - puts "error #{$!} %s" % rss_feed + activity = "error #{$!} %s" % rss_feed + puts activity return unless rss_feed rss_feed.update_attributes(:error_message=> "Unexpected error: #{$!}", :next_fetch => Time.now + 1.minute) end - return true + return activity end end \ No newline at end of file lib/fetch_rss_items.rb @@ -5,10 +5,10 @@ require root + '/config/environment' require root + '/lib/fetch_rss_items' loop do - worth_checking_again_soon = FetchRssItems.fetch_one - if worth_checking_again_soon + activity = FetchRssItems.fetch_one + if activity #got one... sleep for a bit just not to be a processor hog - puts "#{Time.now.to_s :short} checked #{rss_feed.url}" + puts "#{Time.now.to_s :short} " sleep 5 else puts "#{Time.now.to_s :short} nothing to do, wait for a bit" script/rss_feed_fetcher.rb @@ -60,20 +60,20 @@ class RssFeedTest < ActiveSupport::TestCase end should "be able to get next feeds to fetch" do - rss_feed = RssFeed.find_next_to_fetch + rss_feed = RssFeed.find_next_to_fetch! assert_equal rss_feeds(:never_fetched_feed).id, rss_feed.id rss_feed.update_attributes(:last_fetched=>Time.now, :next_fetch => Time.now + 10.minute) - rss_feed = RssFeed.find_next_to_fetch + rss_feed = RssFeed.find_next_to_fetch! assert_equal rss_feeds(:long_ago_fetched_feed), rss_feed rss_feed.update_attributes(:last_fetched=>Time.now, :next_fetch => Time.now + 10.minute) - rss_feed = RssFeed.find_next_to_fetch + rss_feed = RssFeed.find_next_to_fetch! assert_equal rss_feeds(:recently_fetched_feed).id, rss_feed.id rss_feed.update_attributes(:last_fetched=>Time.now, :next_fetch => Time.now + 10.minute) begin - rss_feed = RssFeed.find_next_to_fetch + rss_feed = RssFeed.find_next_to_fetch! flunk "expected error but got #{rss_feed.url}" rescue ActiveRecord::RecordNotFound end test/unit/rss_feed_test.rb 5f65f6c0f10af4c72b956fa58f10e434e7c08eb0 Tim Diggins tim@red56.co.uk http://github.com/red56/the-connected-website/commit/c4dc526defe5270186ecd671ebf44ae2fba1a676 c4dc526defe5270186ecd671ebf44ae2fba1a676 2009-03-14T09:59:06-07:00 2009-03-14T09:59:06-07:00 fixed silly error, made code even more readable 6546dde593a6d5d1e36db6fcd7edc41c3f49c7f8 Tim Diggins tim@red56.co.uk