--- /home/cpdev/src/classpath/java/util/logging/FileHandler.java 2005-07-14 05:32:41.000000000 +0000
+++ java/util/logging/FileHandler.java 2005-06-30 05:34:51.000000000 +0000
@@ -40,15 +40,7 @@
import java.io.File;
import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
-
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-
-import java.util.LinkedList;
-import java.util.ListIterator;
/**
* A FileHandler publishes log records to a set of log
@@ -227,20 +219,6 @@
/**
- * The number of bytes that have currently been written to the stream.
- * Package private for use in inner classes.
- */
- long written;
-
-
- /**
- * A linked list of files we are, or have written to. The entries
- * are file path strings, kept in the order
- */
- private LinkedList logFiles;
-
-
- /**
* Constructs a FileHandler, taking all property values
* from the current {@link LogManager LogManager} configuration.
*
@@ -353,7 +331,8 @@
boolean append)
throws IOException, SecurityException
{
- super(/* output stream, created below */ null,
+ super(createFileStream(pattern, limit, count, append,
+ /* generation */ 0),
"java.util.logging.FileHandler",
/* default level */ Level.ALL,
/* formatter */ null,
@@ -366,20 +345,15 @@
this.limit = limit;
this.count = count;
this.append = append;
- this.written = 0;
- this.logFiles = new LinkedList ();
-
- setOutputStream (createFileStream (pattern, limit, count, append,
- /* generation */ 0));
}
/* FIXME: Javadoc missing. */
- private OutputStream createFileStream(String pattern,
- int limit,
- int count,
- boolean append,
- int generation)
+ private static java.io.OutputStream createFileStream(String pattern,
+ int limit,
+ int count,
+ boolean append,
+ int generation)
{
String path;
int unique = 0;
@@ -398,9 +372,6 @@
if (pattern == null)
pattern = "%h/java%u.log";
- if (count > 1 && !has (pattern, 'g'))
- pattern = pattern + ".%g";
-
do
{
path = replaceFileNameEscapes(pattern, generation, unique, count);
@@ -408,28 +379,16 @@
try
{
File file = new File(path);
- if (!file.exists () || append)
- {
- FileOutputStream fout = new FileOutputStream (file, append);
- // FIXME we need file locks for this to work properly, but they
- // are not implemented yet in Classpath! Madness!
-// FileChannel channel = fout.getChannel ();
-// FileLock lock = channel.tryLock ();
-// if (lock != null) // We've locked the file.
-// {
- if (logFiles.isEmpty ())
- logFiles.addFirst (path);
- return new ostr (fout);
-// }
- }
+ if (file.createNewFile())
+ return new FileOutputStream(path, append);
}
catch (Exception ex)
{
- reportError (null, ex, ErrorManager.OPEN_FAILURE);
+ ex.printStackTrace();
}
unique = unique + 1;
- if (!has (pattern, 'u'))
+ if (pattern.indexOf("%u") < 0)
pattern = pattern + ".%u";
}
while (true);
@@ -527,120 +486,21 @@
}
- /* FIXME: Javadoc missing. */
+ /* FIXME: Javadoc missing, implementation incomplete. */
public void publish(LogRecord record)
{
- if (limit > 0 && written >= limit)
- rotate ();
super.publish(record);
- flush ();
- }
-
- /**
- * Rotates the current log files, possibly removing one if we
- * exceed the file count.
- */
- private synchronized void rotate ()
- {
- if (logFiles.size () > 0)
- {
- File f1 = null;
- ListIterator lit = null;
-
- // If we reach the file count, ditch the oldest file.
- if (logFiles.size () == count)
- {
- f1 = new File ((String) logFiles.getLast ());
- f1.delete ();
- lit = logFiles.listIterator (logFiles.size () - 1);
- }
- // Otherwise, move the oldest to a new location.
- else
- {
- String path = replaceFileNameEscapes (pattern, logFiles.size (),
- /* unique */ 0, count);
- f1 = new File (path);
- logFiles.addLast (path);
- lit = logFiles.listIterator (logFiles.size () - 1);
- }
-
- // Now rotate the files.
- while (lit.hasPrevious ())
- {
- String s = (String) lit.previous ();
- File f2 = new File (s);
- f2.renameTo (f1);
- f1 = f2;
- }
- }
-
- setOutputStream (createFileStream (pattern, limit, count, append,
- /* generation */ 0));
-
- // Reset written count.
- written = 0;
- }
- /**
- * Tell if pattern contains the pattern sequence
- * with character escape. That is, if escape
- * is 'g', this method returns true if the given pattern contains
- * "%g", and not just the substring "%g" (for example, in the case of
- * "%%g").
- *
- * @param pattern The pattern to test.
- * @param escape The escape character to search for.
- * @return True iff the pattern contains the escape sequence with the
- * given character.
- */
- private static boolean has (final String pattern, final char escape)
- {
- final int len = pattern.length ();
- boolean sawPercent = false;
- for (int i = 0; i < len; i++)
- {
- char c = pattern.charAt (i);
- if (sawPercent)
- {
- if (c == escape)
- return true;
- if (c == '%') // Double percent
- {
- sawPercent = false;
- continue;
- }
- }
- sawPercent = (c == '%');
- }
- return false;
- }
-
- /**
- * An output stream that tracks the number of bytes written to it.
- */
- private final class ostr extends FilterOutputStream
- {
- private ostr (OutputStream out)
- {
- super (out);
- }
-
- public void write (final int b) throws IOException
- {
- out.write (b);
- FileHandler.this.written++; // FIXME: synchronize?
- }
-
- public void write (final byte[] b) throws IOException
- {
- write (b, 0, b.length);
- }
-
- public void write (final byte[] b, final int offset, final int length)
- throws IOException
- {
- out.write (b, offset, length);
- FileHandler.this.written += length; // FIXME: synchronize?
- }
+ /* FIXME: Decide when to switch over. How do we get to
+ * the number of bytes published so far? Two possibilities:
+ * 1. File.length, 2. have metering wrapper around
+ * output stream counting the number of written bytes.
+ */
+
+ /* FIXME: Switch over if needed! This implementation always
+ * writes into a single file, i.e. behaves as if limit
+ * always was zero. So, the implementation is somewhat
+ * functional but incomplete.
+ */
}
}