Author: toad
Date: 2005-12-08 14:01:25 +0000 (Thu, 08 Dec 2005)
New Revision: 7698
Modified:
trunk/freenet/src/freenet/node/TestnetHandler.java
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/support/FileLoggerHook.java
Log:
296: (mandatory)
More testnet fixes.
Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java 2005-12-08 13:45:41 UTC
(rev 7697)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java 2005-12-08 14:01:25 UTC
(rev 7698)
@@ -105,7 +105,7 @@
} else if(command.startsWith("GET:")) {
Logger.minor(this, "Sending log:
"+command);
String date =
command.substring("GET:".length());
- DateFormat df =
DateFormat.getDateTimeInstance();
+ DateFormat df =
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT,
Locale.ENGLISH);
df.setTimeZone(TimeZone.getTimeZone("GMT"));
Date d;
try {
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-08 13:45:41 UTC (rev
7697)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-08 14:01:25 UTC (rev
7698)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 295;
+ public static final int buildNumber = 296;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 295;
+ public static final int lastGoodBuild = 296;
/** 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
13:45:41 UTC (rev 7697)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java 2005-12-08
14:01:25 UTC (rev 7698)
@@ -19,6 +19,7 @@
import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.Locale;
import java.util.StringTokenizer;
import java.util.TimeZone;
import java.util.Vector;
@@ -224,6 +225,9 @@
}
filename = getHourLogName(gc, true);
currentFilename = new File(filename);
+ if((!logFiles.isEmpty()) &&
((OldLogFile)logFiles.getLast()).filename.equals(currentFilename)) {
+ logFiles.removeLast();
+ }
logStream = openNewLogFile(currentFilename,
true);
if(latestFilename != null) {
altLogStream =
openNewLogFile(latestFilename, false);
@@ -234,7 +238,7 @@
nextHour = gc.getTimeInMillis();
}
while (true) {
- try {
+ try {
thisTime = System.currentTimeMillis();
if (baseFilename != null) {
if (thisTime > nextHour) {
@@ -246,21 +250,21 @@
System.err.println(
"Flushing on change caught " + e);
}
+ try {
+
logStream.close();
+ } catch (IOException e)
{
+
System.err.println(
+
"Closing on change caught " + e);
+ }
String oldFilename =
filename;
long length =
currentFilename.length();
- OldLogFile olf = new
OldLogFile(currentFilename, startTime, lastTime, length);
+ OldLogFile olf = new
OldLogFile(currentFilename, lastTime, thisTime, length);
lastTime = thisTime;
synchronized(logFiles) {
logFiles.addLast(olf);
}
oldLogFilesDiskSpaceUsage += length;
trimOldLogFiles();
- try {
-
logStream.close();
- } catch (IOException e)
{
-
System.err.println(
-
"Closing on change caught " + e);
- }
// Rotate primary log
stream
filename =
getHourLogName(gc, true);
currentFilename = new
File(filename);
@@ -848,7 +852,7 @@
synchronized(logFiles) {
oldLogFiles = (OldLogFile[]) logFiles.toArray(new
OldLogFile[logFiles.size()]);
}
- DateFormat df = DateFormat.getDateTimeInstance();
+ DateFormat df =
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT,
Locale.ENGLISH);
df.setTimeZone(TimeZone.getTimeZone("GMT"));
for(int i=0;i<oldLogFiles.length;i++) {
OldLogFile olf = oldLogFiles[i];
