ceki 2004/11/20 07:27:05
Modified: src/java/org/apache/log4j/net MulticastReceiver.java
SocketAppender.java SocketReceiver.java
src/java/org/apache/log4j/xml/examples
ReportParserError.java
src/java/org/apache/log4j/xml UtilLoggingEntityResolver.java
Log:
LogLog related changes
Revision Changes Path
1.7 +4 -5
logging-log4j/src/java/org/apache/log4j/net/MulticastReceiver.java
Index: MulticastReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/MulticastReceiver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MulticastReceiver.java 27 May 2004 12:16:57 -0000 1.6
+++ MulticastReceiver.java 20 Nov 2004 15:27:05 -0000 1.7
@@ -16,7 +16,6 @@
package org.apache.log4j.net;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.plugins.Pauseable;
import org.apache.log4j.plugins.Receiver;
import org.apache.log4j.spi.Decoder;
@@ -130,11 +129,11 @@
this.decoderImpl = (Decoder) o;
}
} catch (ClassNotFoundException cnfe) {
- LogLog.warn("Unable to find decoder", cnfe);
+ getLogger().warn("Unable to find decoder", cnfe);
} catch (IllegalAccessException iae) {
- LogLog.warn("Could not construct decoder", iae);
+ getLogger().warn("Could not construct decoder", iae);
} catch (InstantiationException ie) {
- LogLog.warn("Could not construct decoder", ie);
+ getLogger().warn("Could not construct decoder", ie);
}
try {
@@ -250,7 +249,7 @@
}
}
- LogLog.debug(MulticastReceiver.this.getName() + "'s thread is
ending.");
+ getLogger().debug("{}'s thread is ending.",
MulticastReceiver.this.getName());
}
}
}
1.24 +12 -13
logging-log4j/src/java/org/apache/log4j/net/SocketAppender.java
Index: SocketAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketAppender.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SocketAppender.java 9 May 2004 22:33:59 -0000 1.23
+++ SocketAppender.java 20 Nov 2004 15:27:05 -0000 1.24
@@ -19,8 +19,8 @@
package org.apache.log4j.net;
import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.LogManager;
import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;
import java.io.IOException;
@@ -193,7 +193,7 @@
try {
oos.close();
} catch (IOException e) {
- LogLog.error("Could not close oos.", e);
+ getLogger().error("Could not close oos.", e);
}
oos = null;
@@ -229,7 +229,7 @@
/**
* Rather than log an ugly stack trace, output the msg
*/
- LogLog.error(msg + "(" + e.getMessage() + ")");
+ getLogger().error(msg + "(" + e.getMessage() + ")");
}
}
@@ -275,7 +275,7 @@
}
} catch (IOException e) {
oos = null;
- LogLog.warn("Detected problem with connection: " + e);
+ getLogger().warn("Detected problem with connection: " + e);
if (reconnectionDelay > 0) {
fireConnector();
@@ -286,7 +286,7 @@
void fireConnector() {
if (connector == null) {
- LogLog.debug("Starting a new connector thread.");
+ getLogger().debug("Starting a new connector thread.");
connector = new Connector();
connector.setDaemon(true);
connector.setPriority(Thread.MIN_PRIORITY);
@@ -298,7 +298,7 @@
try {
return InetAddress.getByName(host);
} catch (Exception e) {
- LogLog.error("Could not find address of [" + host + "].", e);
+ LogManager.getLogger(SocketAppender.class).error("Could not find
address of [" + host + "].", e);
return null;
}
@@ -417,27 +417,26 @@
while (!interrupted) {
try {
sleep(reconnectionDelay);
- LogLog.debug("Attempting connection to " + address.getHostName());
+ getLogger().debug("Attempting connection to {}",
address.getHostName());
socket = new Socket(address, port);
synchronized (this) {
oos = new ObjectOutputStream(socket.getOutputStream());
connector = null;
- LogLog.debug("Connection established. Exiting connector
thread.");
+ getLogger().debug("Connection established. Exiting connector
thread.");
break;
}
} catch (InterruptedException e) {
- LogLog.debug("Connector interrupted. Leaving loop.");
+ getLogger().debug("Connector interrupted. Leaving loop.");
return;
} catch (java.net.ConnectException e) {
- LogLog.debug(
+ getLogger().debug(
"Remote host " + address.getHostName() + " refused connection.");
} catch (IOException e) {
- LogLog.debug(
- "Could not connect to " + address.getHostName()
- + ". Exception is " + e);
+ getLogger().debug(
+ "Could not connect to {}. Exception is {}",
address.getHostName(), e);
}
}
1.11 +12 -13
logging-log4j/src/java/org/apache/log4j/net/SocketReceiver.java
Index: SocketReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketReceiver.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SocketReceiver.java 5 Aug 2004 19:25:51 -0000 1.10
+++ SocketReceiver.java 20 Nov 2004 15:27:05 -0000 1.11
@@ -28,7 +28,6 @@
import java.util.Map;
import java.util.Vector;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.plugins.Pauseable;
import org.apache.log4j.plugins.Plugin;
import org.apache.log4j.plugins.Receiver;
@@ -123,7 +122,7 @@
* server socket and all of the open sockets.
*/
public synchronized void shutdown() {
- LogLog.debug(getName() + " received shutdown request");
+ getLogger().debug(getName() + " received shutdown request");
// mark this as no longer running
active = false;
@@ -143,7 +142,7 @@
private synchronized void doShutdown() {
active = false;
- LogLog.debug(getName() + " doShutdown called");
+ getLogger().debug(getName() + " doShutdown called");
// close the server socket
closeServerSocket();
@@ -158,7 +157,7 @@
* Closes the server socket, if created.
*/
private void closeServerSocket() {
- LogLog.debug(getName() + " closing server socket");
+ getLogger().debug("{} closing server socket", getName());
try {
if (serverSocket != null) {
@@ -201,7 +200,7 @@
try {
serverSocket = new ServerSocket(port);
} catch (Exception e) {
- LogLog.error(
+ getLogger().error(
"error starting SocketReceiver (" + this.getName()
+ "), receiver did not start", e);
active = false;
@@ -213,14 +212,14 @@
Socket socket = null;
try {
- LogLog.debug("in run-about to enter while not interrupted loop");
+ getLogger().debug("in run-about to enter while not interrupted loop");
active = true;
while (!rThread.isInterrupted()) {
// if we have a socket, start watching it
if (socket != null) {
- LogLog.debug("socket not null - creating and starting socketnode");
+ getLogger().debug("socket not null - creating and starting
socketnode");
socketList.add(socket);
SocketNode node = new SocketNode(socket, this);
@@ -237,19 +236,19 @@
socket = null;
}
- LogLog.debug("waiting to accept socket");
+ getLogger().debug("waiting to accept socket");
// wait for a socket to open, then loop to start it
socket = serverSocket.accept();
- LogLog.debug("accepted socket");
+ getLogger().debug("accepted socket");
}
} catch (Exception e) {
- LogLog.warn(
+ getLogger().warn(
"exception while watching socket server in SocketReceiver ("
+ this.getName() + "), stopping");
}
- LogLog.debug(getName() + " has exited the not interrupted loop");
+ getLogger().debug("{} has exited the not interrupted loop", getName());
// socket not watched because we a no longer running
// so close it now.
@@ -257,11 +256,11 @@
try {
socket.close();
} catch (IOException e1) {
- LogLog.warn("socket exception caught - socket closed");
+ getLogger().warn("socket exception caught - socket closed");
}
}
- LogLog.debug(getName() + " is exiting main run loop");
+ getLogger().debug("{} is exiting main run loop", getName());
}
/**
1.3 +1 -3
logging-log4j/src/java/org/apache/log4j/xml/examples/ReportParserError.java
Index: ReportParserError.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/ReportParserError.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReportParserError.java 14 Dec 2000 21:08:40 -0000 1.2
+++ ReportParserError.java 20 Nov 2004 15:27:05 -0000 1.3
@@ -1,8 +1,6 @@
package org.apache.log4j.xml.examples;
-import org.apache.log4j.helpers.LogLog;
-
/**
This class is needed for validating a log4j.dtd derived XML file.
@@ -15,7 +13,7 @@
public class ReportParserError implements org.xml.sax.ErrorHandler {
void report(String msg, org.xml.sax.SAXParseException e) {
- LogLog.error(msg+e.getMessage()+ "\n\tat line="+ e.getLineNumber()+
+ System.out.println(msg+e.getMessage()+ "\n\tat line="+ e.getLineNumber()+
" col="+e.getColumnNumber()+ " of "+
"SystemId=\""+e.getSystemId()+
"\" PublicID = \""+e.getPublicId()+'\"');
1.4 +18 -15
logging-log4j/src/java/org/apache/log4j/xml/UtilLoggingEntityResolver.java
Index: UtilLoggingEntityResolver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/UtilLoggingEntityResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UtilLoggingEntityResolver.java 23 May 2004 07:46:43 -0000 1.3
+++ UtilLoggingEntityResolver.java 20 Nov 2004 15:27:05 -0000 1.4
@@ -1,12 +1,12 @@
/*
* Copyright 1999,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,34 +16,37 @@
package org.apache.log4j.xml;
-import java.io.InputStream;
-
+import org.apache.log4j.LogManager;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import org.apache.log4j.helpers.LogLog;
+import java.io.InputStream;
+
/**
* An [EMAIL PROTECTED] EntityResolver} specifically designed to return
* <code>java 1.4's logging dtd, logger.dtd</code> which is embedded within
the log4j jar
- * file. Based on EntityResolver.
+ * file. Based on EntityResolver.
*
* @author Paul Austin
* @author Scott Deboy <[EMAIL PROTECTED]>
- *
*/
public class UtilLoggingEntityResolver implements EntityResolver {
-
- public InputSource resolveEntity (String publicId, String systemId) {
+
+
+
+ public InputSource resolveEntity(String publicId, String systemId) {
if (systemId.endsWith("logger.dtd")) {
Class clazz = getClass();
- InputStream in =
clazz.getResourceAsStream("/org/apache/log4j/xml/logger.dtd");
+ InputStream in =
+ clazz.getResourceAsStream("/org/apache/log4j/xml/logger.dtd");
if (in == null) {
- LogLog.error("Could not find [logger.dtd]. Used [" +
clazz.getClassLoader()
- + "] class loader in the search.");
- return null;
+ LogManager.getLogger(UtilLoggingEntityResolver.class).error(
+ "Could not find [logger.dtd]. Used [" + clazz.getClassLoader()
+ + "] class loader in the search.");
+ return null;
} else {
- return new InputSource(in);
+ return new InputSource(in);
}
} else {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
