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
This commit is contained in:
@ -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
|
* 2005-09-01 0.6.0.4 released
|
||||||
|
|
||||||
|
@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class RouterVersion {
|
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 String VERSION = "0.6.0.4";
|
||||||
public final static long BUILD = 0;
|
public final static long BUILD = 1;
|
||||||
public static void main(String args[]) {
|
public static void main(String args[]) {
|
||||||
System.out.println("I2P Router version: " + VERSION);
|
System.out.println("I2P Router version: " + VERSION);
|
||||||
System.out.println("Router ID: " + RouterVersion.ID);
|
System.out.println("Router ID: " + RouterVersion.ID);
|
||||||
|
@ -271,12 +271,16 @@ public class ClientManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean shouldPublishLeaseSet(Hash destHash) {
|
public boolean shouldPublishLeaseSet(Hash destHash) {
|
||||||
|
if (false) return true;
|
||||||
if (destHash == null) return true;
|
if (destHash == null) return true;
|
||||||
ClientConnectionRunner runner = getRunner(destHash);
|
ClientConnectionRunner runner = getRunner(destHash);
|
||||||
if (runner == null) return true;
|
if (runner == null) return true;
|
||||||
String dontPublish = runner.getConfig().getOptions().getProperty(ClientManagerFacade.PROP_CLIENT_ONLY);
|
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 false;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ class FloodfillStoreJob extends StoreJob {
|
|||||||
_facade = facade;
|
_facade = facade;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected int getParallelization() { return 1; }
|
protected int getParallelization() { return 2; }
|
||||||
protected int getRedundancy() { return 1; }
|
protected int getRedundancy() { return 1; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -58,4 +58,6 @@ class FloodfillStoreJob extends StoreJob {
|
|||||||
super.succeed();
|
super.succeed();
|
||||||
getContext().jobQueue().addJob(new FloodfillVerifyStoreJob(getContext(), _state.getTarget(), _facade));
|
getContext().jobQueue().addJob(new FloodfillVerifyStoreJob(getContext(), _state.getTarget(), _facade));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getName() { return "Floodfill netDb store"; }
|
||||||
}
|
}
|
@ -161,11 +161,11 @@ class StoreJob extends JobImpl {
|
|||||||
PeerProfile prof = getContext().profileOrganizer().getProfile(peer);
|
PeerProfile prof = getContext().profileOrganizer().getProfile(peer);
|
||||||
RateStat failing = prof.getDBHistory().getFailedLookupRate();
|
RateStat failing = prof.getDBHistory().getFailedLookupRate();
|
||||||
Rate failed = failing.getRate(60*60*1000);
|
Rate failed = failing.getRate(60*60*1000);
|
||||||
long failedCount = failed.getCurrentEventCount()+failed.getLastEventCount();
|
//long failedCount = failed.getCurrentEventCount()+failed.getLastEventCount();
|
||||||
if (failedCount > 10) {
|
//if (failedCount > 10) {
|
||||||
_state.addSkipped(peer);
|
// _state.addSkipped(peer);
|
||||||
continue;
|
// continue;
|
||||||
}
|
//}
|
||||||
//
|
//
|
||||||
//if (failed.getCurrentEventCount() + failed.getLastEventCount() > avg) {
|
//if (failed.getCurrentEventCount() + failed.getLastEventCount() > avg) {
|
||||||
// _state.addSkipped(peer);
|
// _state.addSkipped(peer);
|
||||||
|
Reference in New Issue
Block a user