From c3cb06028dd0acf29ebd22fd5e1899442040540e Mon Sep 17 00:00:00 2001 From: lnu Date: Thu, 9 Feb 2006 17:39:39 +0000 Subject: git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@82 f70e237a-67f3-0310-a06c-d2b8a7116972 --- lib/feed2imap/feed2imap.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb index c7d8a2a..41c75eb 100644 --- a/lib/feed2imap/feed2imap.rb +++ b/lib/feed2imap/feed2imap.rb @@ -102,34 +102,34 @@ class Feed2Imap ths = [] mutex = Mutex::new @config.feeds.each do |f| - ths << Thread::new(f) do + ths << Thread::new(f) do |feed| begin mutex.lock - lastcheck = @cache.get_last_check(f.name) - if f.needfetch(lastcheck) + lastcheck = @cache.get_last_check(feed.name) + if feed.needfetch(lastcheck) mutex.unlock - s = HTTPFetcher::fetch(f.url, @cache.get_last_check(f.name)) + s = HTTPFetcher::fetch(feed.url, @cache.get_last_check(feed.name)) mutex.lock - f.body = s - @cache.set_last_check(f.name, Time::now) + feed.body = s + @cache.set_last_check(feed.name, Time::now) end mutex.unlock # dump if requested if @config.dumpdir mutex.synchronize do - if f.body - fname = @config.dumpdir + '/' + f.name + '-' + Time::now.xmlschema - File::open(fname, 'w') { |file| file.puts f.body } + if feed.body + fname = @config.dumpdir + '/' + feed.name + '-' + Time::now.xmlschema + File::open(fname, 'w') { |file| file.puts feed.body } end end end rescue Timeout::Error mutex.synchronize do - @logger.fatal("Timeout::Error while fetching #{f.url}: #{$!}") + @logger.fatal("Timeout::Error while fetching #{feed.url}: #{$!}") end rescue mutex.synchronize do - @logger.fatal("Error while fetching #{f.url}: #{$!}") + @logger.fatal("Error while fetching #{feed.url}: #{$!}") end end end -- cgit v1.2.3-54-g00ecf