echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* i2ptunnel.config: Remove irc.freshcoffee.i2p

Browse Source 
* NetDbRenderer: Adjust debug floodfill estimate
 * StatManager: Don't start thread for an empty config
 * StatisticsManager: Don't publish client tunnel stats
 * Log tweaks
This commit is contained in:
zzz
2014-03-28 14:01:39 +00:00
parent d28d6efb79
commit 2d85b98c20
8 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
View File

@ -209,8 +209,8 @@ public class NetDbRenderer {
if (median != null) {
double log2 = biLog2(median);
buf.append("</b></p><p><b>Median distance (bits): ").append(fmt.format(log2));
// 3 for 8 floodfills... -1 for median
int total = (int) Math.round(Math.pow(2, 3 + 256 - 1 - log2));
// 2 for 4 floodfills... -1 for median
int total = (int) Math.round(Math.pow(2, 2 + 256 - 1 - log2));
buf.append("</b></p><p><b>Estimated total floodfills: ").append(total);
buf.append("</b></p><p><b>Estimated total leasesets: ").append(total * rapCount / 8);
} else {

3
core/java/src/net/i2p/stat/StatManager.java
View File

@ -48,7 +48,8 @@ public class StatManager {
_context = context;
_frequencyStats = new ConcurrentHashMap<String,FrequencyStat>(8);
_rateStats = new ConcurrentHashMap<String,RateStat>(128);
if (getStatFilter() != null)
String filter = getStatFilter();
if (filter != null && filter.length() > 0)
_statLog = new BufferedStatLog(context);
}

5
history.txt
View File

@ -1,3 +1,8 @@
2014-03-28 zzz
* i2ptunnel.config: Remove irc.freshcoffee.i2p
* StatManager: Don't start thread for an empty config
* StatisticsManager: Don't publish client tunnel stats
2014-03-28 kytv
* Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country
database from 2014-03-05.

6
installer/resources/i2ptunnel.config
View File

@ -35,7 +35,7 @@ tunnel.1.type=ircclient
tunnel.1.sharedClient=false
tunnel.1.interface=127.0.0.1
tunnel.1.listenPort=6668
tunnel.1.targetDestination=irc.dg.i2p:6667,irc.postman.i2p:6667,irc.freshcoffee.i2p:6667,irc.echelon.i2p:6667
tunnel.1.targetDestination=irc.dg.i2p:6667,irc.postman.i2p:6667,irc.echelon.i2p:6667
tunnel.1.i2cpHost=127.0.0.1
tunnel.1.i2cpPort=7654
tunnel.1.option.inbound.nickname=Irc2P
@ -95,7 +95,7 @@ tunnel.3.option.outbound.length=3
tunnel.3.option.outbound.lengthVariance=0
tunnel.3.startOnLoad=false
# postman's SMTP server - see www.postman.i2p
# postman's SMTP server - see hq.postman.i2p
tunnel.4.description=smtp server
tunnel.4.i2cpHost=127.0.0.1
tunnel.4.i2cpPort=7654
@ -117,7 +117,7 @@ tunnel.4.targetDestination=smtp.postman.i2p:25
tunnel.4.type=client
tunnel.4.sharedClient=true
# postman's POP3 server - see www.postman.i2p
# postman's POP3 server - see hq.postman.i2p
tunnel.5.name=pop3.postman.i2p
tunnel.5.description=pop3 server
tunnel.5.i2cpHost=127.0.0.1

8
router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
View File

@ -408,10 +408,14 @@ public class DatabaseLookupMessage extends FastI2NPMessageImpl {
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
StringBuilder buf = new StringBuilder(256);
buf.append("[DatabaseLookupMessage: ");
buf.append("\n\tSearch Key: ").append(_key);
buf.append("\n\tFrom: ").append(_fromHash);
if (_replyKey != null)
buf.append("\n\tReply GW: ");
else
buf.append("\n\tFrom: ");
buf.append(_fromHash);
buf.append("\n\tReply Tunnel: ").append(_replyTunnel);
if (_replyKey != null)
buf.append("\n\tReply Key: ").append(_replyKey);

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 21;
public final static long BUILD = 22;
/** for example "-test" */
public final static String EXTRA = "-rc";

2
router/java/src/net/i2p/router/StatisticsManager.java
View File

@ -141,7 +141,7 @@ public class StatisticsManager implements Service {
//includeRate("tunnel.buildRequestTime", stats, new long[] { 10*60*1000 });
long rate = 60*60*1000;
includeTunnelRates("Client", stats, rate);
//includeTunnelRates("Client", stats, rate);
includeTunnelRates("Exploratory", stats, rate);
//includeRate("tunnel.rejectTimeout", stats, new long[] { 10*60*1000 });
//includeRate("tunnel.rejectOverloaded", stats, new long[] { 10*60*1000 });

4
router/java/src/net/i2p/router/client/ClientMessageEventListener.java
View File

@ -303,8 +303,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
long timeToDistribute = _context.clock().now() - beforeDistribute;
_runner.ackSendMessage(id, message.getNonce());
_context.statManager().addRateData("client.distributeTime", timeToDistribute);
if ( (timeToDistribute > 50) && (_log.shouldLog(Log.WARN)) )
_log.warn("Took too long to distribute the message (which holds up the ack): " + timeToDistribute);
if ( (timeToDistribute > 50) && (_log.shouldLog(Log.INFO)) )
_log.info("Took too long to distribute the message (which holds up the ack): " + timeToDistribute);
}