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,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);
}
}
}