Author: j16sdiz
Date: 2009-04-24 03:39:59 +0000 (Fri, 24 Apr 2009)
New Revision: 27276
Modified:
trunk/freenet/src/freenet/support/FileLoggerHook.java
trunk/freenet/test/freenet/support/FieldsTest.java
Log:
Use common getHourLogName() for FileLoggerHook
Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java 2009-04-24
00:38:10 UTC (rev 27275)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java 2009-04-24
03:39:59 UTC (rev 27276)
@@ -173,32 +173,13 @@
}
}
-
- protected String getHourLogName(Calendar c, boolean compressed) {
- StringBuilder buf = new StringBuilder(50);
- buf.append(baseFilename).append('-');
- buf.append(Version.buildNumber());
- buf.append('-');
- buf.append(c.get(Calendar.YEAR)).append('-');
- pad2digits(buf, c.get(Calendar.MONTH) + 1);
- buf.append('-');
- pad2digits(buf, c.get(Calendar.DAY_OF_MONTH));
- buf.append('-');
- pad2digits(buf, c.get(Calendar.HOUR_OF_DAY));
- if (INTERVAL == Calendar.MINUTE) {
- buf.append('-');
- pad2digits(buf, c.get(Calendar.MINUTE));
- }
- buf.append(".log");
- if(compressed) buf.append(".gz");
- return buf.toString();
- }
/**
* The extra parameter int digit is to be used for creating a logfile
name
* when a log exists already with the same date.
* @param c
* @param digit
+ * log file name suffix. ignored if this is
{...@code < 0}
* @param compressed
* @return
*/
@@ -217,8 +198,10 @@
buf.append('-');
pad2digits(buf, c.get(Calendar.MINUTE));
}
- buf.append("-");
- buf.append(digit);
+ if (digit > 0) {
+ buf.append("-");
+ buf.append(digit);
+ }
buf.append(".log");
if(compressed) buf.append(".gz");
return buf.toString();
@@ -273,7 +256,7 @@
int x = gc.get(INTERVAL);
gc.set(INTERVAL, (x /
INTERVAL_MULTIPLIER) * INTERVAL_MULTIPLIER);
}
- currentFilename = new File(getHourLogName(gc,
true));
+ currentFilename = new File(getHourLogName(gc,
-1, true));
synchronized(logFiles) {
if((!logFiles.isEmpty()) &&
logFiles.getLast().filename.equals(currentFilename)) {
logFiles.removeLast();
@@ -368,7 +351,7 @@
oldLogFilesDiskSpaceUsage += length;
trimOldLogFiles();
// Rotate primary log stream
- currentFilename = new File(getHourLogName(gc, true));
+ currentFilename = new File(getHourLogName(gc, -1, true));
logStream = openNewLogFile(currentFilename, true);
if(latestFile != null) {
try {
@@ -520,7 +503,7 @@
/** Initialize oldLogFiles */
public void findOldLogFiles() {
GregorianCalendar gc = new GregorianCalendar();
- File currentFilename = new File(getHourLogName(gc, true));
+ File currentFilename = new File(getHourLogName(gc, -1, true));
File numericSameDateFilename;
int slashIndex = baseFilename.lastIndexOf(File.separatorChar);
File dir;
Modified: trunk/freenet/test/freenet/support/FieldsTest.java
===================================================================
--- trunk/freenet/test/freenet/support/FieldsTest.java 2009-04-24 00:38:10 UTC
(rev 27275)
+++ trunk/freenet/test/freenet/support/FieldsTest.java 2009-04-24 03:39:59 UTC
(rev 27276)
@@ -229,9 +229,9 @@
byte[] b2 = new byte[] { 2, 2, 3, 3, 4, 4 };
byte[] b3 = new byte[] { 1, 1, 2, 2, 3, 3 };
- Long l1 = new Long(Fields.longHashCode(b1));
- Long l2 = new Long(Fields.longHashCode(b2));
- Long l3 = new Long(Fields.longHashCode(b3));
+ Long l1 = Fields.longHashCode(b1);
+ Long l2 = Fields.longHashCode(b2);
+ Long l3 = Fields.longHashCode(b3);
assertFalse(l1.equals(l2));
assertFalse(l2.equals(l3));
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
