From 0a1240ebfdb3eebf9254d4e71327d0f94bb66b37 Mon Sep 17 00:00:00 2001
From: complication <complication>
Date: Wed, 26 Dec 2007 20:55:07 +0000
Subject: [PATCH] 2007-12-26 Complication     * Improve reseed handler (less
 repetitive code,       avoid reporting errors when less than 10% of fetches
 fail)

---
 .../src/net/i2p/router/web/ReseedHandler.java | 30 ++++++++++++-------
 history.txt                                   |  6 +++-
 .../src/net/i2p/router/RouterVersion.java     |  4 +--
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java
index e462cfa42..a1427f2b4 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java
@@ -116,6 +116,10 @@ public class ReseedHandler {
         * save them into this router's netDb dir.
         *
         */
+        private static final String RESEED_TIPS =
+        "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
+        "and if nothing helps, read FAQ about reseeding manually.";
+        
         private void reseed(boolean echoStatus) {
 
             String seedURL = _context.getProperty("i2p.reseedURL", DEFAULT_SEED_URL);
@@ -129,8 +133,7 @@ public class ReseedHandler {
                 if (contentRaw == null) {
                     System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
                         "Last reseed failed fully (failed reading seed URL). " +
-                        "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
-                        "and if nothing helps, read FAQ about reseeding manually.");
+                        RESEED_TIPS);
                     // Logging deprecated here since attemptFailed() provides better info
                     _log.debug("Failed reading seed URL: " + seedURL);
                     return;
@@ -152,8 +155,7 @@ public class ReseedHandler {
                     _log.error("Read " + contentRaw.length + " bytes from seed " + seedURL + ", but found no routerInfo URLs.");
                     System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
                         "Last reseed failed fully (no routerInfo URLs at seed URL). " +
-                        "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
-                        "and if nothing helps, read FAQ about reseeding manually.");
+                        RESEED_TIPS);
                     return;
                 }
 
@@ -177,17 +179,25 @@ public class ReseedHandler {
                     }
                 }
                 if (echoStatus) System.out.println();
-                if (errors > 0) {
+                
+                int failPercent = 100 * errors / urls.size();
+                
+                // Less than 10% of failures is considered success,
+                // because some routerInfos will always fail.
+                if ((failPercent >= 10) && (failPercent < 90)) {
                     System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
-                        "Last reseed failed partly (" + errors + " of " + urls.size() + "). " +
-                        "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
-                        "and if nothing helps, read FAQ about reseeding manually.");
+                        "Last reseed failed partly (" + failPercent + "% of " + urls.size() + "). " +
+                        RESEED_TIPS);
+                }
+                if (failPercent >= 90) {
+                    System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
+                        "Last reseed failed (" + failPercent + "% of " + urls.size() + "). " +
+                        RESEED_TIPS);
                 }
             } catch (Throwable t) {
                 System.setProperty("net.i2p.router.web.ReseedHandler.errorMessage",
                     "Last reseed failed fully (exception caught). " +
-                    "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> " +
-                    "and if nothing helps, read FAQ about reseeding manually.");
+                    RESEED_TIPS);
                 _log.error("Error reseeding", t);
             }
         }
diff --git a/history.txt b/history.txt
index 64cf2f075..3d1c843ac 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.602 2007-12-22 18:58:48 zzz Exp $
+$Id: history.txt,v 1.603 2007-12-26 03:14:54 complication Exp $
+
+2007-12-26 Complication
+    * Improve reseed handler (less repetitive code,
+      avoid reporting errors when less than 10% of fetches fail)
 
 2007-12-26 Complication
     * Escape both CR, LF and CR LF line breaks in Router.saveConfig()
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index fd783cc36..b7ca43baf 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.537 $ $Date: 2007-12-22 18:58:46 $";
+    public final static String ID = "$Revision: 1.538 $ $Date: 2007-12-26 03:14:59 $";
     public final static String VERSION = "0.6.1.30";
-    public final static long BUILD = 9;
+    public final static long BUILD = 10;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);