From 484b528d4fa3763d8e325add2f66a6bd38b46298 Mon Sep 17 00:00:00 2001 From: jrandom Date: Tue, 21 Dec 2004 18:23:03 +0000 Subject: [PATCH] * 2004-12-21 0.4.2.5 released 2004-12-21 jrandom * Track a new stat for expired client leases (client.leaseSetExpired). --- history.txt | 7 ++++++- installer/install.xml | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 6 +++--- .../router/tunnelmanager/ClientLeaseSetManagerJob.java | 9 +++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/history.txt b/history.txt index 5aa05c97e..1b356cd6d 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,9 @@ -$Id: history.txt,v 1.116 2004/12/20 00:14:56 jrandom Exp $ +$Id: history.txt,v 1.117 2004/12/21 11:32:50 jrandom Exp $ + +* 2004-12-21 0.4.2.5 released + +2004-12-21 jrandom + * Track a new stat for expired client leases (client.leaseSetExpired). 2004-12-21 jrandom * Cleaned up the postinstall/startup scripts a bit more to handle winME, diff --git a/installer/install.xml b/installer/install.xml index dd37df86e..066b6e0db 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.4.2.4 + 0.4.2.5 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 3da7064c1..75e753573 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.121 $ $Date: 2004/12/20 00:14:56 $"; - public final static String VERSION = "0.4.2.4"; - public final static long BUILD = 6; + public final static String ID = "$Revision: 1.122 $ $Date: 2004/12/21 11:32:50 $"; + public final static String VERSION = "0.4.2.5"; + public final static long BUILD = 0; 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/tunnelmanager/ClientLeaseSetManagerJob.java b/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java index 7b97d11bc..41fe46bc2 100644 --- a/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java +++ b/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java @@ -51,6 +51,8 @@ class ClientLeaseSetManagerJob extends JobImpl { _pool = pool; _currentLeaseSet = null; _lastCreated = -1; + context.statManager().createRateStat("client.leaseSetExpired", "How long ago did our leaseSet expire?", "ClientMessages", new long[] { 60*60*1000l, 24*60*60*1000l }); + } public void forceRequestLease() { @@ -106,6 +108,13 @@ class ClientLeaseSetManagerJob extends JobImpl { _log.warn("Insufficient safe inbound tunnels exist for the client (" + available + " available, " + _pool.getClientSettings().getNumInboundTunnels() + " required) - no leaseSet requested"); + if (_currentLeaseSet != null) { + long howOld = getContext().clock().now() - _currentLeaseSet.getEarliestLeaseDate(); + if (howOld > 0) { + // expired + getContext().statManager().addRateData("client.leaseSetExpired", howOld, 0); + } + } } requeue(RECHECK_DELAY); }