ceki 2004/11/20 07:46:02
Modified: src/java/org/apache/log4j/net XMLSocketReceiver.java
SMTPAppender.java UDPAppender.java
TelnetAppender.java SocketHubAppender.java
UDPReceiver.java SocketHubReceiver.java
MulticastAppender.java
Log:
LogLog related changes
Revision Changes Path
1.9 +10 -11
logging-log4j/src/java/org/apache/log4j/net/XMLSocketReceiver.java
Index: XMLSocketReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/XMLSocketReceiver.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLSocketReceiver.java 28 Mar 2004 10:04:31 -0000 1.8
+++ XMLSocketReceiver.java 20 Nov 2004 15:46:02 -0000 1.9
@@ -21,7 +21,6 @@
import java.util.List;
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;
@@ -158,7 +157,7 @@
private synchronized void doShutdown() {
active = false;
- LogLog.debug(getName() + " doShutdown called");
+ getLogger().debug("{} doShutdown called", getName());
// close the server socket
closeServerSocket();
@@ -171,7 +170,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) {
@@ -206,17 +205,17 @@
/**
* Ensure we start fresh.
*/
- LogLog.debug("performing socket cleanup prior to entering loop for " +
name);
+ getLogger().debug("performing socket cleanup prior to entering loop for
{}", name);
closeServerSocket();
closeAllAcceptedSockets();
- LogLog.debug("socket cleanup complete for " + name);
+ getLogger().debug("socket cleanup complete for {}", name);
active = true;
// start the server socket
try {
serverSocket = new ServerSocket(port);
} catch (Exception e) {
- LogLog.error(
+ getLogger().error(
"error starting SocketReceiver (" + this.getName()
+ "), receiver did not start", e);
active = false;
@@ -228,14 +227,14 @@
Socket socket = null;
try {
- LogLog.debug("in run-about to enter while isactiveloop");
+ getLogger().debug("in run-about to enter while isactiveloop");
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);
XMLSocketNode node = new XMLSocketNode(decoder, socket, this);
@@ -243,11 +242,11 @@
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");
}
// socket not watched because we a no longer running
@@ -256,7 +255,7 @@
socket.close();
}
} catch (Exception e) {
- LogLog.warn(
+ getLogger().warn(
"socket server disconnected, stopping");
}
}
1.35 +2 -3
logging-log4j/src/java/org/apache/log4j/net/SMTPAppender.java
Index: SMTPAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SMTPAppender.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- SMTPAppender.java 27 Feb 2004 16:47:32 -0000 1.34
+++ SMTPAppender.java 20 Nov 2004 15:46:02 -0000 1.35
@@ -20,7 +20,6 @@
import org.apache.log4j.Layout;
import org.apache.log4j.Level;
import org.apache.log4j.helpers.CyclicBuffer;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.ErrorCode;
import org.apache.log4j.spi.LoggingEvent;
@@ -108,7 +107,7 @@
msg.setSubject(subject);
}
} catch (MessagingException e) {
- LogLog.error("Could not activate SMTPAppender options.", e);
+ getLogger().error("Could not activate SMTPAppender options.", e);
}
}
@@ -256,7 +255,7 @@
msg.setSentDate(new Date());
Transport.send(msg);
} catch (Exception e) {
- LogLog.error("Error occured while sending e-mail notification.", e);
+ getLogger().error("Error occured while sending e-mail notification.",
e);
}
}
1.9 +5 -5
logging-log4j/src/java/org/apache/log4j/net/UDPAppender.java
Index: UDPAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/UDPAppender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UDPAppender.java 27 May 2004 14:17:17 -0000 1.8
+++ UDPAppender.java 20 Nov 2004 15:46:02 -0000 1.9
@@ -23,8 +23,8 @@
import java.net.UnknownHostException;
import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.LogManager;
import org.apache.log4j.helpers.*;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;
@@ -146,7 +146,7 @@
try {
outSocket.close();
} catch (Exception e) {
- LogLog.error("Could not close outSocket.", e);
+ getLogger().error("Could not close outSocket.", e);
}
outSocket = null;
@@ -164,7 +164,7 @@
outSocket = new DatagramSocket();
outSocket.connect(address, port);
} catch (IOException e) {
- LogLog.error(
+ getLogger().error(
"Could not open UDP Socket for sending.", e);
inError = true;
}
@@ -210,7 +210,7 @@
event.setProperty(Constants.APPLICATION_KEY, null);
} catch (IOException e) {
outSocket = null;
- LogLog.warn("Detected problem with UDP connection: " + e);
+ getLogger().warn("Detected problem with UDP connection: " + e);
}
}
}
@@ -223,7 +223,7 @@
try {
return InetAddress.getByName(host);
} catch (Exception e) {
- LogLog.error("Could not find address of [" + host + "].", e);
+ LogManager.getLogger(UDPAppender.class).error("Could not find address
of [" + host + "].", e);
return null;
}
1.6 +4 -3
logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java
Index: TelnetAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TelnetAppender.java 27 Feb 2004 16:47:32 -0000 1.5
+++ TelnetAppender.java 20 Nov 2004 15:46:02 -0000 1.6
@@ -18,7 +18,7 @@
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Layout;
-import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
import java.io.*;
@@ -120,7 +120,8 @@
private Vector connections = new Vector();
private ServerSocket serverSocket;
private int MAX_CONNECTIONS = 20;
-
+ private Logger logger = Logger.getLogger(SocketHandler.class);
+
public SocketHandler(int port) throws IOException {
serverSocket = new ServerSocket(port);
}
@@ -182,7 +183,7 @@
newClient.close();
}
} catch (Exception e) {
- LogLog.error("Encountered error while in SocketHandler loop.", e);
+ logger.error("Encountered error while in SocketHandler loop.", e);
}
}
}
1.10 +19 -18
logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java
Index: SocketHubAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SocketHubAppender.java 27 Feb 2004 16:47:32 -0000 1.9
+++ SocketHubAppender.java 20 Nov 2004 15:46:02 -0000 1.10
@@ -26,8 +26,8 @@
import java.util.Vector;
import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.Logger;
import org.apache.log4j.helpers.CyclicBuffer;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;
@@ -143,10 +143,10 @@
return;
}
- LogLog.debug("closing SocketHubAppender " + getName());
+ getLogger().debug("closing SocketHubAppender {}", getName());
this.closed = true;
cleanUp();
- LogLog.debug("SocketHubAppender " + getName() + " closed");
+ getLogger().debug("SocketHubAppender {} closed", getName());
}
/**
@@ -154,12 +154,12 @@
to all connected remote servers. */
public void cleanUp() {
// stop the monitor thread
- LogLog.debug("stopping ServerSocket");
+ getLogger().debug("stopping ServerSocket");
serverMonitor.stopMonitor();
serverMonitor = null;
// close all of the connections
- LogLog.debug("closing client connections");
+ getLogger().debug("closing client connections");
while (oosList.size() != 0) {
ObjectOutputStream oos = (ObjectOutputStream) oosList.elementAt(0);
@@ -168,7 +168,7 @@
try {
oos.close();
} catch (IOException e) {
- LogLog.error("could not close oos.", e);
+ getLogger().error("could not close oos.", e);
}
oosList.removeElementAt(0);
@@ -222,7 +222,7 @@
} catch (IOException e) {
// there was an io exception so just drop the connection
oosList.removeElementAt(streamCount);
- LogLog.debug("dropped connection");
+ getLogger().debug("dropped connection");
// decrement to keep the counter in place (for loop always
increments)
streamCount--;
@@ -296,7 +296,8 @@
private Vector oosList;
private boolean keepRunning;
private Thread monitorThread;
-
+ Logger logger = Logger.getLogger(ServerMonitor.class);
+
/**
Create a thread and start the monitor. */
public ServerMonitor(int _port, Vector _oosList) {
@@ -313,7 +314,7 @@
the thread has finished executing. */
public synchronized void stopMonitor() {
if (keepRunning) {
- LogLog.debug("server monitor thread shutting down");
+ logger.debug("server monitor thread shutting down");
keepRunning = false;
try {
@@ -324,7 +325,7 @@
// release the thread
monitorThread = null;
- LogLog.debug("server monitor thread shut down");
+ logger.debug("server monitor thread shut down");
}
}
@@ -348,7 +349,7 @@
serverSocket = new ServerSocket(port);
serverSocket.setSoTimeout(1000);
} catch (Exception e) {
- LogLog.error(
+ logger.error(
"exception setting timeout, shutting down server socket.", e);
keepRunning = false;
@@ -359,7 +360,7 @@
try {
serverSocket.setSoTimeout(1000);
} catch (SocketException e) {
- LogLog.error(
+ logger.error(
"exception setting timeout, shutting down server socket.", e);
return;
@@ -373,20 +374,20 @@
} catch (InterruptedIOException e) {
// timeout occurred, so just loop
} catch (SocketException e) {
- LogLog.error(
+ logger.error(
"exception accepting socket, shutting down server socket.", e);
keepRunning = false;
} catch (IOException e) {
- LogLog.error("exception accepting socket.", e);
+ logger.error("exception accepting socket.", e);
}
// if there was a socket accepted
if (socket != null) {
try {
InetAddress remoteAddress = socket.getInetAddress();
- LogLog.debug(
- "accepting connection from " + remoteAddress.getHostName()
- + " (" + remoteAddress.getHostAddress() + ")");
+ logger.debug(
+ "accepting connection from {} ({})",
remoteAddress.getHostName()
+ , remoteAddress.getHostAddress());
// create an ObjectOutputStream
ObjectOutputStream oos =
@@ -398,7 +399,7 @@
// add it to the oosList. OK since Vector is synchronized.
oosList.addElement(oos);
} catch (IOException e) {
- LogLog.error("exception creating output stream on socket.", e);
+ logger.error("exception creating output stream on socket.", e);
}
}
}
1.10 +5 -6
logging-log4j/src/java/org/apache/log4j/net/UDPReceiver.java
Index: UDPReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/UDPReceiver.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UDPReceiver.java 27 May 2004 14:17:17 -0000 1.9
+++ UDPReceiver.java 20 Nov 2004 15:46:02 -0000 1.10
@@ -24,7 +24,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.plugins.Pauseable;
import org.apache.log4j.plugins.Receiver;
import org.apache.log4j.spi.Decoder;
@@ -127,11 +126,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 {
@@ -214,7 +213,7 @@
}
}
} // while
- LogLog.debug(UDPReceiver.this.getName()+ "'s handler thread is
exiting");
+ getLogger().debug(UDPReceiver.this.getName()+ "'s handler thread is
exiting");
} // run
} // UDPHandlerThread
@@ -247,7 +246,7 @@
}
}
- LogLog.debug(UDPReceiver.this.getName() + "'s thread is ending.");
+ //LogLog.debug(UDPReceiver.this.getName() + "'s thread is ending.");
}
}
}
1.12 +9 -10
logging-log4j/src/java/org/apache/log4j/net/SocketHubReceiver.java
Index: SocketHubReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketHubReceiver.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SocketHubReceiver.java 25 May 2004 04:45:21 -0000 1.11
+++ SocketHubReceiver.java 20 Nov 2004 15:46:02 -0000 1.12
@@ -14,7 +14,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.Logger;
import org.apache.log4j.plugins.Plugin;
import org.apache.log4j.plugins.Receiver;
import org.apache.log4j.spi.LoggerRepository;
@@ -210,7 +210,7 @@
private synchronized void fireConnector(boolean isReconnect) {
if (active && connector == null) {
- LogLog.debug("Starting a new connector thread.");
+ getLogger().debug("Starting a new connector thread.");
connector = new Connector(isReconnect);
connector.setDaemon(true);
connector.setPriority(Thread.MIN_PRIORITY);
@@ -248,6 +248,7 @@
boolean interrupted = false;
boolean doDelay;
+ Logger logger = Logger.getLogger(Connector.class);
public Connector(boolean isReconnect) {
doDelay = isReconnect;
@@ -257,25 +258,23 @@
while(!interrupted) {
try {
if (doDelay) {
- LogLog.debug("waiting for " + reconnectionDelay +
+ logger.debug("waiting for " + reconnectionDelay +
" milliseconds before reconnecting.");
sleep(reconnectionDelay);
}
doDelay = true;
- LogLog.debug("Attempting connection to "+ host);
+ logger.debug("Attempting connection to "+ host);
Socket socket = new Socket(host, port);
setSocket(socket);
- LogLog.debug("Connection established. Exiting connector
thread.");
+ logger.debug("Connection established. Exiting connector
thread.");
break;
} catch(InterruptedException e) {
- LogLog.debug("Connector interrupted. Leaving loop.");
+ logger.debug("Connector interrupted. Leaving loop.");
return;
} catch(java.net.ConnectException e) {
- LogLog.debug("Remote host "+ host
- +" refused connection.");
+ logger.debug("Remote host {} refused connection.", host);
} catch(IOException e) {
- LogLog.debug("Could not connect to " + host +
- ". Exception is " + e);
+ logger.debug("Could not connect to {}. Exception is {}.",
host, e);
}
}
}
1.7 +4 -4
logging-log4j/src/java/org/apache/log4j/net/MulticastAppender.java
Index: MulticastAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/MulticastAppender.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MulticastAppender.java 27 Feb 2004 16:47:32 -0000 1.6
+++ MulticastAppender.java 20 Nov 2004 15:46:02 -0000 1.7
@@ -23,8 +23,8 @@
import java.net.UnknownHostException;
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;
@@ -140,7 +140,7 @@
try {
outSocket.close();
} catch (Exception e) {
- LogLog.error("Could not close outSocket.", e);
+ getLogger().error("Could not close outSocket.", e);
}
outSocket = null;
@@ -199,7 +199,7 @@
event.setProperty(Constants.APPLICATION_KEY, null);
} catch (IOException e) {
outSocket = null;
- LogLog.warn("Detected problem with Multicast connection: " + e);
+ getLogger().warn("Detected problem with Multicast connection: " + e);
}
}
}
@@ -208,7 +208,7 @@
try {
return InetAddress.getByName(host);
} catch (Exception e) {
- LogLog.error("Could not find address of [" + host + "].", e);
+ LogManager.getLogger(MulticastAppender.class).error("Could not find
address of [" + host + "].", e);
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
