diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | lib/feed2imap/feed2imap.rb | 15 |
2 files changed, 12 insertions, 5 deletions
@@ -7,6 +7,8 @@ Feed2Imap 0.9.2 (XX/10/2007) 16 should be a reasonable default for everybody. Closes Gna #9032. * Reduce the default HTTP timeout to 30s. +* Don't update the cache if uploading items failed (should avoid + missing some items). Feed2Imap 0.9.1 (15/05/2007) ============================ diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb index c46ff3b..061e8c6 100644 --- a/lib/feed2imap/feed2imap.rb +++ b/lib/feed2imap/feed2imap.rb @@ -102,7 +102,7 @@ class Feed2Imap @logger.info("Fetching and filtering feeds ...") ths = [] mutex = Mutex::new - sparefetchers = 8 # max number of fetchers running at the same time. + sparefetchers = 16 # max number of fetchers running at the same time. sparefetchers_mutex = Mutex::new sparefetchers_cond = ConditionVariable::new @config.feeds.each do |f| @@ -113,11 +113,10 @@ class Feed2Imap if feed.needfetch(lastcheck) mutex.unlock sparefetchers_mutex.synchronize do - if sparefetchers <= 0 + while sparefetchers <= 0 sparefetchers_cond.wait(sparefetchers_mutex) - else - sparefetchers -= 1 end + sparefetchers -= 1 end if feed.url s = HTTPFetcher::fetch(feed.url, @cache.get_last_check(feed.name)) @@ -188,6 +187,7 @@ class Feed2Imap ths.each { |t| t.join } @logger.info("Parsing and uploading ...") @config.feeds.each do |f| + everything_ok = true if f.body.nil? # means 304 @logger.debug("Feed #{f.name} did not change.") next @@ -228,10 +228,15 @@ class Feed2Imap rescue @logger.fatal("Exception caught while uploading mail to #{f.folder}: #{$!}") puts $!.backtrace + everything_ok = false next end begin - @cache.commit_cache(f.name) + if everything_ok + @cache.commit_cache(f.name) + else + @logger.fatal("Not updating cache for #{f.name} because something went wrong earlier.") + end rescue @logger.fatal("Exception caught while updating cache for #{f.name}: #{$!}") next |