diff options
| author | Lucas Nussbaum <lucas@lucas-nussbaum.net> | 2012-04-26 10:21:33 +0200 |
|---|---|---|
| committer | Lucas Nussbaum <lucas@lucas-nussbaum.net> | 2012-04-26 10:21:33 +0200 |
| commit | c8c32eea5d329773bda8ce0a073266ab498507c5 (patch) | |
| tree | 1f6bd5bf62b826c51ed7912e9e7f3c3c5bf70694 /lib/feed2imap/feed2imap.rb | |
| parent | 04db76a10d2f26e124731f7601722bfa2de61dfe (diff) | |
| parent | d3ac1f64a5ba90d755e58bd0f3ff2813baca510b (diff) | |
| download | feed2imap-c8c32eea5d329773bda8ce0a073266ab498507c5.tar.gz feed2imap-c8c32eea5d329773bda8ce0a073266ab498507c5.tar.bz2 feed2imap-c8c32eea5d329773bda8ce0a073266ab498507c5.zip | |
Merge remote-tracking branch 'chimrod/master'
Diffstat (limited to '')
| -rw-r--r-- | lib/feed2imap/feed2imap.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb index b938a39..acfb56e 100644 --- a/lib/feed2imap/feed2imap.rb +++ b/lib/feed2imap/feed2imap.rb @@ -121,7 +121,9 @@ class Feed2Imap end fetch_start = Time::now if feed.url - s = HTTPFetcher::fetch(feed.url, @cache.get_last_check(feed.name)) + fetcher = HTTPFetcher::new + fetcher::timeout = @config.timeout + s = fetcher::fetch(feed.url, @cache.get_last_check(feed.name)) elsif feed.execurl # avoid running more than one command at the same time. # We need it because the called command might not be |