Author: toad
Date: 2005-12-08 13:45:41 +0000 (Thu, 08 Dec 2005)
New Revision: 7697
Modified:
trunk/freenet/src/freenet/node/TestnetHandler.java
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/support/FileLoggerHook.java
Log:
295: (mandatory)
More testnet fixes.
Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java 2005-12-08 00:50:41 UTC
(rev 7696)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java 2005-12-08 13:45:41 UTC
(rev 7697)
@@ -43,7 +43,7 @@
System.err.println("You have no anonymity. Thank you for
running a testnet node, this will help the developers to efficiently debug
Freenet, by letting them (and anyone else who knows how!!) automatically fetch
your log files.");
System.err.println("We repeat: YOU HAVE NO ANONYMITY
WHATSOEVER. DO NOT POST ANYTHING YOU DO NOT WANT TO BE ASSOCIATED WITH.");
System.err.println("If you want a real freenet node, with
anonymity, turn off testnet mode.");
- System.err.println("Note, this node will not connect to
non-testnet nodes, for security reasons. You can of course run a testnet node
and a non-testnet node.");
+ System.err.println("Note, this node will not connect to
non-testnet nodes, for security reasons. You can of course run a testnet node
and a non-testnet node separately.");
serverThread = new Thread(this, "Testnet handler thread");
serverThread.setDaemon(true);
serverThread.start();
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-08 00:50:41 UTC (rev
7696)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-08 13:45:41 UTC (rev
7697)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 294;
+ public static final int buildNumber = 295;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 293;
+ public static final int lastGoodBuild = 295;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java 2005-12-08
00:50:41 UTC (rev 7696)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java 2005-12-08
13:45:41 UTC (rev 7697)
@@ -192,6 +192,7 @@
File currentFilename = null;
Object o = null;
long thisTime = System.currentTimeMillis();
+ long lastTime = thisTime;
long startTime = -1;
long nextHour = -1;
GregorianCalendar gc = null;
@@ -247,7 +248,8 @@
}
String oldFilename =
filename;
long length =
currentFilename.length();
- OldLogFile olf = new
OldLogFile(currentFilename, startTime, thisTime, length);
+ OldLogFile olf = new
OldLogFile(currentFilename, startTime, lastTime, length);
+ lastTime = thisTime;
synchronized(logFiles) {
logFiles.addLast(olf);
}
@@ -261,6 +263,7 @@
}
// Rotate primary log
stream
filename =
getHourLogName(gc, true);
+ currentFilename = new
File(filename);
logStream =
openNewLogFile(new File(filename), true);
if(latestFilename !=
null) {
try {
