From 6422f7ef788a13bd77a3f52c51995f8038cfdfa8 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Fri, 2 Sep 2005 18:34:14 +0000
Subject: [PATCH] 2005-09-02  jrandom     * Don't refuse to send a netDb store
 if the targetted peer has failed a       bit (the value was an arbitrary
 amount).     * Logging changes

---
 history.txt                                            |  7 ++++++-
 router/java/src/net/i2p/router/RouterVersion.java      |  4 ++--
 .../java/src/net/i2p/router/client/ClientManager.java  |  6 +++++-
 .../router/networkdb/kademlia/FloodfillStoreJob.java   |  4 +++-
 .../net/i2p/router/networkdb/kademlia/StoreJob.java    | 10 +++++-----
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/history.txt b/history.txt
index 4d1e693ef..e4b920f83 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
-$Id: history.txt,v 1.234 2005/09/01 01:55:02 jrandom Exp $
+$Id: history.txt,v 1.235 2005/09/01 15:27:35 jrandom Exp $
+
+2005-09-02  jrandom
+    * Don't refuse to send a netDb store if the targetted peer has failed a 
+      bit (the value was an arbitrary amount).
+    * Logging changes
 
 * 2005-09-01  0.6.0.4 released
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 609fd3d01..12f94fbbe 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.223 $ $Date: 2005/09/01 01:55:01 $";
+    public final static String ID = "$Revision: 1.224 $ $Date: 2005/09/01 15:27:35 $";
     public final static String VERSION = "0.6.0.4";
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index 6a258994e..9cd6e0c58 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -271,12 +271,16 @@ public class ClientManager {
     }
     
     public boolean shouldPublishLeaseSet(Hash destHash) { 
+        if (false) return true;
         if (destHash == null) return true;
         ClientConnectionRunner runner = getRunner(destHash);
         if (runner == null) return true;
         String dontPublish = runner.getConfig().getOptions().getProperty(ClientManagerFacade.PROP_CLIENT_ONLY);
-        if ( (dontPublish != null) && ("true".equals(dontPublish)) )
+        if ( (dontPublish != null) && ("true".equals(dontPublish)) ) {
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Not publishing the leaseSet for " + destHash.toBase64());
             return false;
+        } 
         return true;
     }
 
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
index 28e6fb23c..295300070 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
@@ -48,7 +48,7 @@ class FloodfillStoreJob extends StoreJob {
         _facade = facade;
     }
 
-    protected int getParallelization() { return 1; }
+    protected int getParallelization() { return 2; }
     protected int getRedundancy() { return 1; }
 
     /**
@@ -58,4 +58,6 @@ class FloodfillStoreJob extends StoreJob {
         super.succeed();
         getContext().jobQueue().addJob(new FloodfillVerifyStoreJob(getContext(), _state.getTarget(), _facade));
     }
+    
+    public String getName() { return "Floodfill netDb store"; }
 }
\ No newline at end of file
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
index 5401a8456..623def4b6 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
@@ -161,11 +161,11 @@ class StoreJob extends JobImpl {
                     PeerProfile prof = getContext().profileOrganizer().getProfile(peer);
                     RateStat failing = prof.getDBHistory().getFailedLookupRate();
                     Rate failed = failing.getRate(60*60*1000);
-                    long failedCount = failed.getCurrentEventCount()+failed.getLastEventCount();
-                    if (failedCount > 10) {
-                        _state.addSkipped(peer);
-                        continue;
-                    }
+                    //long failedCount = failed.getCurrentEventCount()+failed.getLastEventCount();
+                    //if (failedCount > 10) {
+                    //    _state.addSkipped(peer);
+                    //    continue;
+                    //}
                     //
                     //if (failed.getCurrentEventCount() + failed.getLastEventCount() > avg) {
                     //    _state.addSkipped(peer);