+2003-08-31 Ingo Proetel <proetel@aicas.com>
+
+ * java/util/logging/Logger.java: provide class and method information
+ * java/util/logging/LogManager.java: create handlers
+ * java/util/logging/SimpleFormatter.java: print souceClassName and
+ sourceMethodName
2003-08-28 Mohan Embar <gnustuff@thisiscool.com>
* win32.cc: fixed tab, indentation and whitespace
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Map;
+import java.util.StringTokenizer;
import java.lang.ref.WeakReference;
/**
* the order in which classes are initialized.
*/
Logger.getLogger("global").setParent(rootLogger);
+ Logger.getLogger("global").setUseParentHandlers(true);
}
public synchronized void readConfiguration(InputStream inputStream)
throws IOException, SecurityException
- {
+ {
Properties newProperties;
Enumeration keys;
while (keys.hasMoreElements())
{
- String key = (String) keys.nextElement();
+ String key = ((String) keys.nextElement()).trim();
String value = newProperties.getProperty(key);
-
+
if (value == null)
continue;
-
+
+ value = value.trim();
+
+ if("handlers".equals(key))
+ {
+ StringTokenizer tokenizer = new StringTokenizer(value);
+ while(tokenizer.hasMoreTokens())
+ {
+ String handlerName = tokenizer.nextToken();
+ try
+ {
+ Class handlerClass = Class.forName(handlerName);
+ getLogger("").addHandler((Handler)handlerClass.newInstance());
+ }
+ catch (ClassCastException ex)
+ {
+ System.err.println("[LogManager] class " + handlerName + " is not subclass of java.util.logging.Handler");
+ }
+ catch (Exception ex)
+ {
+ //System.out.println("[LogManager.readConfiguration]"+ex);
+ }
+ }
+ }
+
if (key.endsWith(".level"))
{
String loggerName = key.substring(0, key.length() - 6);
}
catch (Exception _)
{
+ //System.out.println("[LogManager.readConfiguration] "+_);
}
continue;
}
String message,
Object param)
{
+ StackTraceElement caller = getCallerStackFrame();
logp(level,
- /* sourceClass*/ null,
- /* sourceMethod */ null,
+ caller.getClassName(),
+ caller.getMethodName(),
message,
param);
}
String message,
Object[] params)
{
+ StackTraceElement caller = getCallerStackFrame();
logp(level,
- /* sourceClass*/ null,
- /* sourceMethod */ null,
+ caller.getClassName(),
+ caller.getMethodName(),
message,
params);
}
String message,
Throwable thrown)
{
+ StackTraceElement caller = getCallerStackFrame();
logp(level,
- /* sourceClass*/ null,
- /* sourceMethod */ null,
+ caller.getClassName(),
+ caller.getMethodName(),
message,
thrown);
}
this.parent = parent;
}
+
+ /**
+ * Gets the StackTraceElement of the first class that is not this class.
+ * That should be the initial caller of a logging method.
+ * @return caller of the initial looging method
+ */
+ private StackTraceElement getCallerStackFrame()
+ {
+ Throwable t = new Throwable();
+ StackTraceElement[] stackTrace = t.getStackTrace();
+ int index = 0;
+ // skip to stackentries until this class
+ while(!stackTrace[index].getClassName().equals(getClass().getName())){index++;}
+ // skip the stackentries of this class
+ while(stackTrace[index].getClassName().equals(getClass().getName())){index++;}
+
+ return stackTrace[index];
+ }
+
}
buf.append(dateFormat.format(new Date(record.getMillis())));
buf.append(' ');
- buf.append(record.getLoggerName());
+ buf.append(record.getSourceClassName());
+ buf.append(' ');
+ buf.append(record.getSourceMethodName());
buf.append(lineSep);
buf.append(record.getLevel());