I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* NewsFetcher:

Browse Source 
- Add backup URL
      - Change to 0 retries (was 2)
This commit is contained in:
zzz
2010-05-23 16:15:37 +00:00
parent fdc83484fd
commit 48da98d0e4
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java
View File

@ -47,6 +47,8 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
private static final String NEWS_FILE = "docs/news.xml"; private static final String NEWS_FILE = "docs/news.xml";
private static final String TEMP_NEWS_FILE = "news.xml.temp"; private static final String TEMP_NEWS_FILE = "news.xml.temp";
/** @since 0.7.14 not configurable */
private static final String BACKUP_NEWS_URL = "http://www.i2p2.i2p/_static/news/news.xml";
private NewsFetcher(I2PAppContext ctx) { private NewsFetcher(I2PAppContext ctx) {
_context = ctx; _context = ctx;
@ -151,12 +153,20 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
try { try {
EepGet get = null; EepGet get = null;
if (shouldProxy) if (shouldProxy)
get = new EepGet(_context, true, proxyHost, proxyPort, 2, _tempFile.getAbsolutePath(), newsURL, true, null, _lastModified); get = new EepGet(_context, true, proxyHost, proxyPort, 0, _tempFile.getAbsolutePath(), newsURL, true, null, _lastModified);
else else
get = new EepGet(_context, false, null, 0, 0, _tempFile.getAbsolutePath(), newsURL, true, null, _lastModified); get = new EepGet(_context, false, null, 0, 0, _tempFile.getAbsolutePath(), newsURL, true, null, _lastModified);
get.addStatusListener(this); get.addStatusListener(this);
if (get.fetch()) if (get.fetch()) {
_lastModified = get.getLastModified(); _lastModified = get.getLastModified();
} else {
// backup news location - always proxied
_tempFile.delete();
get = new EepGet(_context, true, proxyHost, proxyPort, 0, _tempFile.getAbsolutePath(), BACKUP_NEWS_URL, true, null, _lastModified);
get.addStatusListener(this);
if (get.fetch())
_lastModified = get.getLastModified();
}
} catch (Throwable t) { } catch (Throwable t) {
_log.error("Error fetching the news", t); _log.error("Error fetching the news", t);
} }