sdeboy 2004/03/25 20:51:27
Modified: src/java/org/apache/log4j/varia
LogFilePatternReceiverBeanInfo.java
LogFilePatternReceiver.java
src/java/org/apache/log4j/chainsaw
TableColorizingRenderer.java
Log:
- changed 'logger precision' property to represent 'number of package levels to
hide' and updated logic to correctly handle numbers outside of the package count -
works better if you have a consistent package hierarchy (org.apache.log4j for example)
with a varying number of sub packages
- changed logFilePatternReceiver's parameter for continual processing of the file
(tailing) from 'looping' to 'tailing' and added description in javadoc
Revision Changes Path
1.5 +1 -1
logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiverBeanInfo.java
Index: LogFilePatternReceiverBeanInfo.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiverBeanInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogFilePatternReceiverBeanInfo.java 17 Mar 2004 04:19:37 -0000 1.4
+++ LogFilePatternReceiverBeanInfo.java 26 Mar 2004 04:51:27 -0000 1.5
@@ -38,7 +38,7 @@
new PropertyDescriptor("timestampFormat",
LogFilePatternReceiver.class),
new PropertyDescriptor("logFormat", LogFilePatternReceiver.class),
new PropertyDescriptor("name", LogFilePatternReceiver.class),
- new PropertyDescriptor("looping", LogFilePatternReceiver.class),
+ new PropertyDescriptor("tailing", LogFilePatternReceiver.class),
};
} catch (Exception e) {
}
1.5 +11 -8
logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java
Index: LogFilePatternReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogFilePatternReceiver.java 17 Mar 2004 04:19:37 -0000 1.4
+++ LogFilePatternReceiver.java 26 Mar 2004 04:51:27 -0000 1.5
@@ -102,7 +102,10 @@
* param: "timestampFormat" value="yyyy-MM-d HH:mm:ss,SSS"
* param: "logFormat" value="RELATIVETIME [THREAD] LEVEL LOGGER * - MESSAGE"
* param: "fileName" value="c:/logs/A4.log"
+ * param: "tailing" value="true"
*
+ * The 'tailing' parameter allows the contents of the file to be continually read
and new events processed.
+ *
* NOTE: in our example file content below, the timestampFormat entry defined above
* is not required, but included as an example of how to specify the format. See
SimpleDateFormat
* for more information.
@@ -136,7 +139,7 @@
private String logFormat;
private String fileName;
private String shortFileName;
- private boolean looping;
+ private boolean tailing;
/**
* Creates a new LogFilePatternReceiver object.
@@ -232,19 +235,19 @@
/**
* Accessor
*
- * @return looping
+ * @return tailing
*/
- public boolean isLooping() {
- return looping;
+ public boolean isTailing() {
+ return tailing;
}
/**
* Mutator
*
- * @param looping
+ * @param tailing
*/
- public void setLooping(boolean looping) {
- this.looping = looping;
+ public void setTailing(boolean tailing) {
+ this.tailing = tailing;
}
/**
@@ -390,7 +393,7 @@
}
} catch (InterruptedException ie) {
}
- } while (looping);
+ } while (tailing);
}
/**
1.15 +7 -7
logging-log4j/src/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
Index: TableColorizingRenderer.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TableColorizingRenderer.java 27 Feb 2004 16:47:29 -0000 1.14
+++ TableColorizingRenderer.java 26 Mar 2004 04:51:27 -0000 1.15
@@ -111,17 +111,16 @@
break;
} else {
String logger = value.toString();
- int startPos = logger.length();
+ int startPos = -1;
for (int i = 0; i < loggerPrecision; i++) {
- startPos = logger.lastIndexOf(".", startPos - 1);
+ startPos = logger.indexOf(".", startPos + 1);
+ if (startPos < 0) {
+ break;
+ }
}
- if (startPos < 0) {
- break;
- } else {
- ((JLabel) c).setText(logger.substring(startPos + 1));
- }
+ ((JLabel) c).setText(logger.substring(startPos + 1));
}
break;
@@ -205,6 +204,7 @@
try {
loggerPrecision = Integer.parseInt(loggerPrecisionText);
} catch (NumberFormatException nfe) {
+ loggerPrecision = 0;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
