migrate from JUL to SLF4j

This commit is contained in:
Richard Vowles committed 2013-04-11 21:53:25 +12:00
1 parent 4ce891eb43
commit 0a951165e5
108 files changed
+688 -631

No files matched your search

@@ -1,8 +1,6 @@
package com.avaje.ebeaninternal.server.cluster;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.config.GlobalProperties;
@@ -10,13 +8,15 @@ import com.avaje.ebeaninternal.api.ClassUtil;
import com.avaje.ebeaninternal.server.cluster.mcast.McastClusterManager;
import com.avaje.ebeaninternal.server.cluster.socket.SocketClusterBroadcast;
import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Manages the cluster service.
*/
public class ClusterManager {
private static final Logger logger = Logger.getLogger(ClusterManager.class.getName());
private static final Logger logger = LoggerFactory.getLogger(ClusterManager.class);
private final ConcurrentHashMap<String, EbeanServer> serverMap = new ConcurrentHashMap<String, EbeanServer>();
@@ -49,7 +49,7 @@ public class ClusterManager {
} catch (Exception e) {
String msg = "Error initialising ClusterManager type [" + clusterType + "]";
logger.log(Level.SEVERE, msg, e);
logger.error(msg, e);
throw new RuntimeException(e);
}
}
@@ -1,11 +1,13 @@
package com.avaje.ebeaninternal.server.cluster.mcast;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
/**
* For Incoming Packets remembers the packets we have received and processed.
@@ -89,7 +91,7 @@ public class IncomingPacketsProcessed {
*/
public static class GotAllPoint {
private static final Logger logger = Logger.getLogger(GotAllPoint.class.getName());
private static final Logger logger = LoggerFactory.getLogger(GotAllPoint.class);
private final String memberKey;
private final int maxResendIncoming;
@@ -196,7 +198,7 @@ public class IncomingPacketsProcessed {
int i = resendCount.intValue() + 1;
if (i > maxResendIncoming){
// we are going to give up trying to get this packet now
logger.warning("Exceeded maxResendIncoming["+maxResendIncoming+"] for packet["+packetId+"]. Giving up on requesting it.");
logger.warn("Exceeded maxResendIncoming["+maxResendIncoming+"] for packet["+packetId+"]. Giving up on requesting it.");
resendCountMap.remove(packetId);
outOfOrderList.add(packetId);
return false;
@@ -7,8 +7,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebean.config.GlobalProperties;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
@@ -17,6 +15,8 @@ import com.avaje.ebeaninternal.server.cluster.ClusterManager;
import com.avaje.ebeaninternal.server.cluster.Packet;
import com.avaje.ebeaninternal.server.cluster.PacketWriter;
import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Overall Manager of the Multicast Cluster communication for this instance.
@@ -38,7 +38,7 @@ import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent;
*/
public class McastClusterManager implements ClusterBroadcast, Runnable {
private static final Logger logger = Logger.getLogger(McastClusterManager.class.getName());
private static final Logger logger = LoggerFactory.getLogger(McastClusterManager.class);
private ClusterManager clusterManager;
@@ -316,7 +316,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
// no members online so trim the entire outgoing packets cache
int trimmedCount = outgoingPacketsCache.trimAll();
if (trimmedCount > 0){
logger.fine("Cluster has no other members. Trimmed "+trimmedCount);
logger.debug("Cluster has no other members. Trimmed "+trimmedCount);
}
} else if (minAckedFromListener > minAcked){
@@ -358,7 +358,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
}
} catch (Exception e){
String msg = "Error with Cluster Mcast Manager thread";
logger.log(Level.SEVERE, msg, e);
logger.error(msg, e);
}
}
}
@@ -384,7 +384,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
Packet packet = outgoingPacketsCache.getPacket(resendPacketId);
if (packet == null){
String msg = "Cluster unable to resend packet["+resendPacketId+"] as it is no longer in the outgoingPacketsCache";
logger.log(Level.SEVERE, msg);
logger.error(msg);
} else {
int resendCount = packet.incrementResendCount();
if (resendCount <= maxResendOutgoing) {
@@ -392,7 +392,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
} else {
String msg = "Cluster maxResendOutgoing ["+maxResendOutgoing+"] hit for packet "+resendPacketId
+". We will not try to send it anymore, removing it from the outgoingPacketsCache.";
logger.log(Level.SEVERE, msg);
logger.error(msg);
outgoingPacketsCache.remove(packet);
}
}
@@ -409,7 +409,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
totalBytesResent += localSender.sendPacket(packet);
} catch (IOException e) {
String msg = "Error trying to resend packet "+packet.getPacketId();
logger.log(Level.SEVERE, msg, e);
logger.error(msg, e);
}
}
@@ -531,7 +531,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
} catch (IOException e) {
String msg = "Error sending Messages " + messages;
logger.log(Level.SEVERE, msg, e);
logger.error(msg, e);
return false;
}
}
@@ -569,7 +569,7 @@ public class McastClusterManager implements ClusterBroadcast, Runnable {
}
} catch (IOException e) {
String msg = "Error sending RemoteTransactionEvent " + remoteTransEvent;
logger.log(Level.SEVERE, msg, e);
logger.error( msg, e);
}
}
}
@@ -27,13 +27,13 @@ import java.net.DatagramPacket;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.MulticastSocket;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebean.config.GlobalProperties;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
import com.avaje.ebeaninternal.server.cluster.Packet;
import com.avaje.ebeaninternal.server.cluster.PacketTransactionEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Listens for Incoming packets.
@@ -42,7 +42,7 @@ import com.avaje.ebeaninternal.server.cluster.PacketTransactionEvent;
*/
public class McastListener implements Runnable {
private static final Logger logger = Logger.getLogger(McastListener.class.getName());
private static final Logger logger = LoggerFactory.getLogger(McastListener.class);
private final McastClusterManager owner;
@@ -141,7 +141,7 @@ public class McastListener implements Runnable {
if (!shutdownComplete){
String msg = "WARNING: Shutdown of McastListener did not complete?";
System.err.println(msg);
logger.warning(msg);
logger.warn(msg);
}
try {
@@ -150,7 +150,7 @@ public class McastListener implements Runnable {
// send to syserr in case logging already shutdown
e.printStackTrace();
String msg = "Error leaving Multicast group";
logger.log(Level.INFO, msg, e);
logger.info(msg, e);
}
try {
sock.close();
@@ -158,7 +158,7 @@ public class McastListener implements Runnable {
// send to syserr in case logging already shutdown
e.printStackTrace();
String msg = "Error closing Multicast socket";
logger.log(Level.INFO, msg, e);
logger.info(msg, e);
}
}
@@ -173,7 +173,7 @@ public class McastListener implements Runnable {
String senderHostPort = senderAddr.getAddress().getHostAddress()+":"+senderAddr.getPort();
if (senderHostPort.equals(localSenderHostPort)){
if (debugIgnore || logger.isLoggable(Level.FINE)){
if (debugIgnore || logger.isDebugEnabled()){
logger.info("Ignoring message as sent by localSender: "+localSenderHostPort);
}
} else {
@@ -195,11 +195,11 @@ public class McastListener implements Runnable {
boolean processThisPacket = ackMsg || packetControl.isProcessPacket(senderHostPort, header.getPacketId());
if (!processThisPacket){
if (debugIgnore || logger.isLoggable(Level.FINE)){
if (debugIgnore || logger.isDebugEnabled()){
logger.info("Already processed packet: "+header.getPacketId()+" type:"+header.getPacketType()+" len:"+data.length);
}
} else {
if (logger.isLoggable(Level.FINER)){
if (logger.isTraceEnabled()){
logger.info("Incoming packet:"+header.getPacketId()+" type:"+header.getPacketType()+" len:"+data.length);
}
processPacket(senderHostPort, header, dataInput);
@@ -207,13 +207,13 @@ public class McastListener implements Runnable {
}
} catch (java.net.SocketTimeoutException e) {
if (logger.isLoggable(Level.FINE)) {
logger.log(Level.FINE, "timeout", e);
if (logger.isDebugEnabled()) {
logger.debug("timeout", e);
}
packetControl.onListenerTimeout();
} catch (IOException e) {
logger.log(Level.INFO, "error ?", e);
logger.info("error ?", e);
}
}
@@ -239,13 +239,13 @@ public class McastListener implements Runnable {
default:
String msg = "Unknown Packet type:" + header.getPacketType();
logger.log(Level.SEVERE, msg);
logger.error(msg);
break;
}
} catch (IOException e) {
// need to ask to get this packet resent...
String msg = "Error reading Packet " + header.getPacketId() + " type:" + header.getPacketType();
logger.log(Level.SEVERE, msg, e);
logger.error(msg, e);
}
}
@@ -4,11 +4,11 @@ import java.io.DataInput;
import java.io.IOException;
import java.util.HashSet;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebeaninternal.server.cluster.Packet;
import com.avaje.ebeaninternal.server.cluster.PacketMessages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Helps co-ordinate Packet information between the McastListener and the
@@ -18,7 +18,7 @@ import com.avaje.ebeaninternal.server.cluster.PacketMessages;
*/
public class McastPacketControl {
private static final Logger logger = Logger.getLogger(McastPacketControl.class.getName());
private static final Logger logger = LoggerFactory.getLogger(McastPacketControl.class);
private final String localSenderHostPort;
@@ -53,8 +53,8 @@ public class McastPacketControl {
packetMessages.read(dataInput);
List<Message> messages = packetMessages.getMessages();
if (logger.isLoggable(Level.FINER)) {
logger.finer("INCOMING Messages " + messages);
if (logger.isTraceEnabled()) {
logger.trace("INCOMING Messages " + messages);
}
// messages are for all nodes in the cluster so
// we need to filter looking for messages pertaining
@@ -77,8 +77,8 @@ public class McastPacketControl {
} else if (message instanceof MessageResend) {
resend = (MessageResend) message;
} else {
logger.log(Level.SEVERE, "Expecting a MessageAck or MessageResend but got a "
+ message.getClass().getName());
logger.error("Expecting a MessageAck or MessageResend but got a "
+ message.getClass().getName());
}
}
}
@@ -6,10 +6,10 @@ import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebeaninternal.server.cluster.Packet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Handles the sending of Packets via DatagramPacket.
@@ -18,7 +18,7 @@ import com.avaje.ebeaninternal.server.cluster.Packet;
*/
public class McastSender {
private static final Logger logger = Logger.getLogger(McastSender.class.getName());
private static final Logger logger = LoggerFactory.getLogger(McastSender.class);
private final int port;
@@ -86,12 +86,12 @@ public class McastSender {
byte[] pktBytes = packet.getBytes();
if (logger.isLoggable(Level.FINE)){
logger.fine("OUTGOING packet: " + packet.getPacketId() + " size:" + pktBytes.length);
if (logger.isDebugEnabled()){
logger.debug("OUTGOING packet: " + packet.getPacketId() + " size:" + pktBytes.length);
}
if (pktBytes.length > 65507){
logger.warning("OUTGOING packet: " + packet.getPacketId() + " size:" + pktBytes.length
logger.warn("OUTGOING packet: " + packet.getPacketId() + " size:" + pktBytes.length
+" likely to be truncated using UDP with a MAXIMUM length of 65507");
}
@@ -1,9 +1,10 @@
package com.avaje.ebeaninternal.server.cluster.socket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.Socket;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
* This parses and dispatches a request to the appropriate handler.
@@ -15,11 +16,11 @@ import java.util.logging.Logger;
*/
class RequestProcessor implements Runnable {
private static final Logger logger = Logger.getLogger(RequestProcessor.class.getName());
private static final Logger logger = LoggerFactory.getLogger(RequestProcessor.class);
private final Socket clientSocket;
private final Socket clientSocket;
private final SocketClusterBroadcast owner;
private final SocketClusterBroadcast owner;
/**
* Create including the Listener (used to lookup the Request Handler) and
@@ -49,9 +50,9 @@ class RequestProcessor implements Runnable {
sc.disconnect();
} catch (IOException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
} catch (ClassNotFoundException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -1,12 +1,13 @@
package com.avaje.ebeaninternal.server.cluster.socket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
@@ -14,7 +15,7 @@ import java.util.logging.Logger;
*/
class SocketClient {
private static final Logger logger = Logger.getLogger(SocketClient.class.getName());
private static final Logger logger = LoggerFactory.getLogger(SocketClient.class);
private final InetSocketAddress address;
@@ -88,7 +89,7 @@ class SocketClient {
socket.close();
} catch (IOException e) {
String msg = "Error disconnecting from Cluster member "+hostPort;
logger.log(Level.INFO, msg, e);
logger.info(msg, e);
}
os = null;
@@ -5,8 +5,6 @@ import java.io.InterruptedIOException;
import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -18,13 +16,15 @@ import com.avaje.ebeaninternal.server.cluster.DataHolder;
import com.avaje.ebeaninternal.server.cluster.SerialiseTransactionHelper;
import com.avaje.ebeaninternal.server.lib.util.StringHelper;
import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Broadcast messages across the cluster using sockets.
*/
public class SocketClusterBroadcast implements ClusterBroadcast {
private static final Logger logger = Logger.getLogger(SocketClusterBroadcast.class.getName());
private static final Logger logger = LoggerFactory.getLogger(SocketClusterBroadcast.class);
private final SocketClient local;
@@ -133,11 +133,11 @@ public class SocketClusterBroadcast implements ClusterBroadcast {
client.send(msg);
} catch (Exception ex){
logger.log(Level.SEVERE, "Error sending message", ex);
logger.error("Error sending message", ex);
try {
client.reconnect();
} catch (IOException e) {
logger.log(Level.SEVERE, "Error trying to reconnect", ex);
logger.error("Error trying to reconnect", ex);
}
}
}
@@ -154,7 +154,7 @@ public class SocketClusterBroadcast implements ClusterBroadcast {
broadcast(msg);
} catch (Exception e){
String msg = "Error sending RemoteTransactionEvent "+remoteTransEvent+" to cluster members.";
logger.log(Level.SEVERE, msg, e);
logger.error(msg, e);
}
}
@@ -204,11 +204,11 @@ public class SocketClusterBroadcast implements ClusterBroadcast {
}
} catch (InterruptedIOException e) {
String msg = "Timeout waiting for message";
logger.log(Level.INFO, msg, e);
logger.info(msg, e);
try {
request.disconnect();
} catch (IOException ex){
logger.log(Level.INFO, "Error disconnecting after timeout", ex);
logger.info("Error disconnecting after timeout", ex);
}
return true;
}
@@ -5,11 +5,11 @@ import java.io.InterruptedIOException;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebeaninternal.server.lib.thread.ThreadPool;
import com.avaje.ebeaninternal.server.lib.thread.ThreadPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Serverside multithreaded socket listener. Accepts connections and dispatches
@@ -26,7 +26,7 @@ import com.avaje.ebeaninternal.server.lib.thread.ThreadPoolManager;
*/
class SocketClusterListener implements Runnable {
private static final Logger logger = Logger.getLogger(SocketClusterListener.class.getName());
private static final Logger logger = LoggerFactory.getLogger(SocketClusterListener.class);
/**
* The port the SocketListener uses.
@@ -118,7 +118,7 @@ class SocketClusterListener implements Runnable {
listenerThread.interrupt();
serverListenSocket.close();
} catch (IOException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -146,17 +146,17 @@ class SocketClusterListener implements Runnable {
logger.info(msg);
} else {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
} catch (InterruptedIOException e) {
// this will happen when the server is very quiet.
// that is, no requests
logger.fine("Possibly expected due to accept timeout?" + e.getMessage());
logger.debug("Possibly expected due to accept timeout?" + e.getMessage());
} catch (IOException e) {
// log it and continue in the loop...
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
}