I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2006-04-01 jrandom

Browse Source 
* Take out the router watchdog's teeth (don't restart on leaseset failure)
This commit is contained in:
jrandom
2006-04-01 19:05:35 +00:00
committed by zzz
parent 15e6c27c04
commit 1b3ad31bff
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
history.txt
View File

@ -1,4 +1,7 @@
$Id: history.txt,v 1.440 2006/03/26 18:23:54 jrandom Exp $
$Id: history.txt,v 1.441 2006/03/30 02:26:43 jrandom Exp $
2006-04-01 jrandom
* Take out the router watchdog's teeth (don't restart on leaseset failure)
2006-03-30 jrandom
* Substantially reduced the lock contention in the message registry (a

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

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
public final static String ID = "$Revision: 1.381 $ $Date: 2006/03/26 18:23:52 $";
public final static String ID = "$Revision: 1.382 $ $Date: 2006/03/30 02:26:49 $";
public final static String VERSION = "0.6.1.13";
public final static long BUILD = 1;
public final static long BUILD = 2;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);

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

@ -47,7 +47,7 @@ class RouterWatchdog implements Runnable {
}
private boolean shutdownOnHang() {
return Boolean.valueOf(_context.getProperty("watchdog.haltOnHang", "true")).booleanValue();
return Boolean.valueOf(_context.getProperty("watchdog.haltOnHang", "false")).booleanValue();
}
private void dumpStatus() {

6
router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java
View File

@ -131,9 +131,9 @@ class OutboundClientMessageJobHelper {
TunnelId replyToTunnelId = null; // tunnel id on that gateway
if (replyToTunnel == null) {
if (log.shouldLog(Log.ERROR))
log.error("Unable to send client message from " + from.toBase64()
+ ", as there are no inbound tunnels available");
if (log.shouldLog(Log.WARN))
log.warn("Unable to send client message from " + from.toBase64()
+ ", as there are no inbound tunnels available");
return null;
}
replyToTunnelId = replyToTunnel.getReceiveTunnelId(0);

4
router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
View File

@ -213,8 +213,8 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
if (ok) {
send();
} else {
if (_log.shouldLog(Log.ERROR))
_log.error("Unable to send on a random lease, as getNext returned null (to=" + _toString + ")");
if (_log.shouldLog(Log.WARN))
_log.warn("Unable to send on a random lease, as getNext returned null (to=" + _toString + ")");
dieFatal();
}
}