From 19a26f8e22bf6d7dcea5f2973717a6f667740fc6 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 20 Apr 2015 18:48:00 +0000 Subject: [PATCH] Reseed: Prep for disabling non-su3 fetches (ticket #1513) --- .../src/net/i2p/router/networkdb/reseed/Reseeder.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java index 98a24adec..2cd50d834 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -60,8 +60,10 @@ public class Reseeder { /** limit to spend on a single host, to avoid getting stuck on one that is seriously overloaded */ private static final int MAX_TIME_PER_HOST = 7 * 60 * 1000; private static final long MAX_FILE_AGE = 30*24*60*60*1000L; - /** change to false if hosts not ready at release */ + /** Don't disable this! */ private static final boolean ENABLE_SU3 = true; + /** if false, use su3 only, and disable fallback reading directory index and individual dat files */ + private static final boolean ENABLE_NON_SU3 = true; /** * NOTE - URLs that are in both the standard and SSL groups must use the same hostname, @@ -497,8 +499,10 @@ public class Reseeder { dl = reseedSU3(new URL(url.toString() + SU3_FILENAME), echoStatus); } catch (MalformedURLException mue) {} } - if (dl <= 0) - dl = reseedOne(url, echoStatus); + if (ENABLE_NON_SU3) { + if (dl <= 0) + dl = reseedOne(url, echoStatus); + } if (dl > 0) { total += dl; // Don't go on to the next URL if we have enough