ceki 2004/11/20 07:51:33
Modified: src/java/org/apache/log4j/rolling RollingFileAppender.java
src/java/org/apache/log4j/varia LogFilePatternReceiver.java
src/java/org/apache/log4j/net XMLSocketNode.java
Log:
LogLog related changes
Revision Changes Path
1.18 +1 -2
logging-log4j/src/java/org/apache/log4j/rolling/RollingFileAppender.java
Index: RollingFileAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/rolling/RollingFileAppender.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RollingFileAppender.java 31 May 2004 21:29:15 -0000 1.17
+++ RollingFileAppender.java 20 Nov 2004 15:51:33 -0000 1.18
@@ -18,7 +18,6 @@
import org.apache.log4j.FileAppender;
import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.ErrorCode;
import org.apache.log4j.spi.LoggingEvent;
@@ -101,7 +100,7 @@
try {
rollingPolicy.rollover();
} catch(RolloverFailure rf) {
- LogLog.warn("RolloverFailure occurred. Deferring rollover.");
+ getLogger().warn("RolloverFailure occurred. Deferring rollover.");
// we failed to rollover, let us not truncate and risk data loss
append = true;
}
1.20 +8 -9
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- LogFilePatternReceiver.java 13 Sep 2004 05:03:44 -0000 1.19
+++ LogFilePatternReceiver.java 20 Nov 2004 15:51:33 -0000 1.20
@@ -35,7 +35,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.plugins.Receiver;
import org.apache.log4j.rule.ExpressionRule;
import org.apache.log4j.rule.Rule;
@@ -314,7 +313,7 @@
}
}
} catch (MalformedPatternException mpe) {
- LogLog.warn("Bad pattern: " + EXCEPTION_PATTERN);
+ getLogger().warn("Bad pattern: " + EXCEPTION_PATTERN);
}
return -1;
}
@@ -419,7 +418,7 @@
Perl5Matcher eventMatcher = new Perl5Matcher();
String line = null;
- LogLog.debug("tailing file: " + tailing);
+ getLogger().debug("tailing file: " + tailing);
do {
while ((line = bufferedReader.readLine()) != null) {
if (eventMatcher.matches(line, regexpPattern)) {
@@ -442,7 +441,7 @@
if (passesExpression(event)) {
doPost(event);
}
- LogLog.debug("no further lines to process in " + fileURL);
+ getLogger().debug("no further lines to process in " + fileURL);
}
try {
synchronized (this) {
@@ -451,7 +450,7 @@
} catch (InterruptedException ie) {
}
} while (tailing);
- LogLog.debug("processing " + fileURL + " complete");
+ getLogger().debug("processing " + fileURL + " complete");
shutdown();
}
@@ -513,7 +512,7 @@
expressionRule = ExpressionRule.getRule(filterExpression);
}
} catch (Exception e) {
- LogLog.warn("Invalid filter expression: " + filterExpression, e);
+ getLogger().warn("Invalid filter expression: " + filterExpression, e);
}
Map keywordMap = new TreeMap();
@@ -580,7 +579,7 @@
}
}
regexp = currentPattern;
- LogLog.debug("regexp is " + regexp);
+ getLogger().debug("regexp is " + regexp);
}
/**
@@ -747,14 +746,14 @@
try {
reader = new InputStreamReader(new URL(getFileURL()).openStream());
} catch (IOException ioe) {
- LogLog.debug("exception", ioe);
+ getLogger().debug("exception", ioe);
return;
}
try {
process(reader);
} catch (IOException ioe) {
//io exception - probably shut down
- LogLog.debug("stream closed");
+ getLogger().debug("stream closed");
}
}
}).start();
1.7 +8 -9
logging-log4j/src/java/org/apache/log4j/net/XMLSocketNode.java
Index: XMLSocketNode.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/XMLSocketNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLSocketNode.java 10 Aug 2004 06:16:56 -0000 1.6
+++ XMLSocketNode.java 20 Nov 2004 15:51:33 -0000 1.7
@@ -18,7 +18,6 @@
import org.apache.log4j.*;
import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.plugins.Receiver;
import org.apache.log4j.spi.*;
@@ -44,13 +43,13 @@
@since 0.8.4
*/
public class XMLSocketNode implements Runnable {
- static Logger logger = Logger.getLogger(XMLSocketNode.class);
+ Logger logger = Logger.getLogger(XMLSocketNode.class);
Socket socket;
LoggerRepository hierarchy;
Receiver receiver;
Decoder decoder;
SocketNodeEventListener listener;
-
+
/**
Constructor for socket and logger repository. */
public XMLSocketNode(
@@ -63,11 +62,11 @@
this.decoder = (Decoder) o;
}
} catch (ClassNotFoundException cnfe) {
- LogLog.warn("Unable to find decoder", cnfe);
+ logger.warn("Unable to find decoder", cnfe);
} catch (IllegalAccessException iae) {
- LogLog.warn("Unable to construct decoder", iae);
+ logger.warn("Unable to construct decoder", iae);
} catch (InstantiationException ie) {
- LogLog.warn("Unable to construct decoder", ie);
+ logger.warn("Unable to construct decoder", ie);
}
this.socket = socket;
@@ -85,11 +84,11 @@
this.decoder = (Decoder) o;
}
} catch (ClassNotFoundException cnfe) {
- LogLog.warn("Unable to find decoder", cnfe);
+ logger.warn("Unable to find decoder", cnfe);
} catch (IllegalAccessException iae) {
- LogLog.warn("Unable to construct decoder", iae);
+ logger.warn("Unable to construct decoder", iae);
} catch (InstantiationException ie) {
- LogLog.warn("Unable to construct decoder", ie);
+ logger.warn("Unable to construct decoder", ie);
}
this.socket = socket;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
