ceki 2002/10/22 12:40:40
Modified: src/java/org/apache/log4j/filters LevelRangeMatchFilter.java
LevelMatchFilter.java
src/java/org/apache/log4j Receiver.java
Log:
Minor changes.
event.categoryName changed to event.getLoggerName()
and
event.level changed to event.getLevel()
Revision Changes Path
1.2 +2 -2
jakarta-log4j/src/java/org/apache/log4j/filters/LevelRangeMatchFilter.java
Index: LevelRangeMatchFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/filters/LevelRangeMatchFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LevelRangeMatchFilter.java 16 Jun 2002 04:47:45 -0000 1.1
+++ LevelRangeMatchFilter.java 22 Oct 2002 19:40:40 -0000 1.2
@@ -78,14 +78,14 @@
<code>LevelMax</code>. */
protected boolean match(LoggingEvent event) {
if(this.levelMin != null) {
- if (event.level.isGreaterOrEqual(levelMin) == false) {
+ if (event.getLevel().isGreaterOrEqual(levelMin) == false) {
// level of event is less than minimum
return false;
}
}
if(this.levelMax != null) {
- if (event.level.toInt() > levelMax.toInt()) {
+ if (event.getLevel().toInt() > levelMax.toInt()) {
// level of event is greater than maximum
// Alas, there is no Level.isGreater method. and using
// a combo of isGreaterOrEqual && !Equal seems worse than
1.3 +1 -2
jakarta-log4j/src/java/org/apache/log4j/filters/LevelMatchFilter.java
Index: LevelMatchFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/filters/LevelMatchFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LevelMatchFilter.java 12 Jun 2002 06:07:34 -0000 1.2
+++ LevelMatchFilter.java 22 Oct 2002 19:40:40 -0000 1.3
@@ -53,11 +53,10 @@
protected boolean canMatch() {
return (levelToMatch != null);
}
-
/**
Returns true if the levelToMatch matches the level of the
logging event. */
protected boolean match(LoggingEvent event) {
- return (levelToMatch.equals(event.level));
+ return (levelToMatch.equals(event.getLevel()));
}
}
1.3 +2 -2 jakarta-log4j/src/java/org/apache/log4j/Receiver.java
Index: Receiver.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Receiver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Receiver.java 9 Oct 2002 22:50:02 -0000 1.2
+++ Receiver.java 22 Oct 2002 19:40:40 -0000 1.3
@@ -53,11 +53,11 @@
// get the "local" logger for this event from the
// configured repository.
Logger localLogger =
- getLoggerRepository().getLogger(event.categoryName);
+ getLoggerRepository().getLogger(event.getLoggerName());
// if the logger level is greater or equal to the level
// of the event, use the logger to append the event.
- if(event.level.isGreaterOrEqual(localLogger.getEffectiveLevel())) {
+ if(event.getLevel().isGreaterOrEqual(localLogger.getEffectiveLevel())) {
// set the logger for the event
// event.logger = localLogger;
--
To unsubscribe, e-mail: <mailto:log4j-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:log4j-dev-help@;jakarta.apache.org>
