You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2011/04/12 09:14:12 UTC
svn commit: r1091314 [2/3] - in /zookeeper/trunk: ./ src/contrib/loggraph/
src/contrib/loggraph/src/java/org/apache/zookeeper/graph/
src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/
src/contrib/rest/ src/contrib/rest/src/java/org/apac...
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java Tue Apr 12 07:14:07 2011
@@ -30,14 +30,15 @@ import java.util.zip.Checksum;
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.InputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.persistence.FileHeader;
import org.apache.zookeeper.server.persistence.FileTxnLog;
import org.apache.zookeeper.server.util.SerializeUtils;
import org.apache.zookeeper.txn.TxnHeader;
public class LogFormatter {
- private static final Logger LOG = Logger.getLogger(LogFormatter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LogFormatter.class);
/**
* @param args
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java Tue Apr 12 07:14:07 2011
@@ -39,7 +39,8 @@ import java.util.concurrent.LinkedBlocki
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.Environment;
import org.apache.zookeeper.Version;
import org.apache.zookeeper.WatchedEvent;
@@ -57,7 +58,7 @@ import com.sun.management.UnixOperatingS
* client, but only one thread doing the communication.
*/
public class NIOServerCnxn extends ServerCnxn {
- static final Logger LOG = Logger.getLogger(NIOServerCnxn.class);
+ static final Logger LOG = LoggerFactory.getLogger(NIOServerCnxn.class);
NIOServerCnxnFactory factory;
@@ -340,7 +341,7 @@ public class NIOServerCnxn extends Serve
// expecting close to log session closure
close();
} catch (EndOfStreamException e) {
- LOG.warn(e); // tell user why
+ LOG.warn("caught end of stream exception",e); // tell user why
// expecting close to log session closure
close();
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java Tue Apr 12 07:14:07 2011
@@ -32,10 +32,11 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NIOServerCnxnFactory extends ServerCnxnFactory implements Runnable {
- private static final Logger LOG = Logger.getLogger(NIOServerCnxnFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NIOServerCnxnFactory.class);
static {
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java Tue Apr 12 07:14:07 2011
@@ -40,7 +40,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.Environment;
import org.apache.zookeeper.Version;
import org.apache.zookeeper.WatchedEvent;
@@ -57,7 +58,7 @@ import org.jboss.netty.channel.MessageEv
import com.sun.management.UnixOperatingSystemMXBean;
public class NettyServerCnxn extends ServerCnxn {
- Logger LOG = Logger.getLogger(NettyServerCnxn.class);
+ Logger LOG = LoggerFactory.getLogger(NettyServerCnxn.class);
Channel channel;
ChannelBuffer queuedBuffer;
volatile boolean throttled;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java Tue Apr 12 07:14:07 2011
@@ -28,7 +28,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.Executors;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
@@ -45,7 +46,7 @@ import org.jboss.netty.channel.group.Def
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
public class NettyServerCnxnFactory extends ServerCnxnFactory {
- Logger LOG = Logger.getLogger(NettyServerCnxnFactory.class);
+ Logger LOG = LoggerFactory.getLogger(NettyServerCnxnFactory.class);
ServerBootstrap bootstrap;
Channel parentChannel;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java Tue Apr 12 07:14:07 2011
@@ -27,7 +27,8 @@ import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs;
@@ -60,7 +61,7 @@ import org.apache.zookeeper.txn.TxnHeade
* in the queue to be applied when generating a transaction.
*/
public class PrepRequestProcessor extends Thread implements RequestProcessor {
- private static final Logger LOG = Logger.getLogger(PrepRequestProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PrepRequestProcessor.class);
static boolean skipACL;
static {
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java Tue Apr 12 07:14:07 2011
@@ -28,7 +28,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
import org.apache.zookeeper.server.persistence.Util;
@@ -41,7 +42,7 @@ import org.apache.zookeeper.server.persi
* and the corresponding logs.
*/
public class PurgeTxnLog {
- private static final Logger LOG = Logger.getLogger(PurgeTxnLog.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PurgeTxnLog.class);
static void printUsage(){
System.out.println("PurgeTxnLog dataLogDir [snapDir] -n count");
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.nio.ByteBuffer;
import java.util.List;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.data.Id;
@@ -34,7 +35,7 @@ import org.apache.zookeeper.txn.TxnHeade
* onto the request as it is processed.
*/
public class Request {
- private static final Logger LOG = Logger.getLogger(Request.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Request.class);
public final static Request requestOfDeath = new Request(null, 0, 0, 0,
null, null);
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.HashMap;
import javax.management.JMException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.MBeanRegistry;
public abstract class ServerCnxnFactory {
@@ -36,7 +37,7 @@ public abstract class ServerCnxnFactory
public void processPacket(ByteBuffer packet, ServerCnxn src);
}
- Logger LOG = Logger.getLogger(ServerCnxnFactory.class);
+ Logger LOG = LoggerFactory.getLogger(ServerCnxnFactory.class);
/**
* The buffer will cause the connection to be close when we do a send.
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java Tue Apr 12 07:14:07 2011
@@ -28,7 +28,8 @@ import java.util.HashSet;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.SessionExpiredException;
@@ -39,7 +40,7 @@ import org.apache.zookeeper.KeeperExcept
* in a given interval.
*/
public class SessionTrackerImpl extends Thread implements SessionTracker {
- private static final Logger LOG = Logger.getLogger(SessionTrackerImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SessionTrackerImpl.class);
HashMap<Long, SessionImpl> sessionsById = new HashMap<Long, SessionImpl>();
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Stats.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Stats.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Stats.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Stats.java Tue Apr 12 07:14:07 2011
@@ -65,4 +65,4 @@ interface Stats {
/** Reset counters
* @since 3.3.0 */
void resetStats();
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java Tue Apr 12 07:14:07 2011
@@ -24,7 +24,8 @@ import java.util.LinkedList;
import java.util.Random;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -33,7 +34,7 @@ import org.apache.log4j.Logger;
* until its log has been synced to disk.
*/
public class SyncRequestProcessor extends Thread implements RequestProcessor {
- private static final Logger LOG = Logger.getLogger(SyncRequestProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SyncRequestProcessor.class);
private final ZooKeeperServer zks;
private final LinkedBlockingQueue<Request> queuedRequests =
new LinkedBlockingQueue<Request>();
@@ -145,7 +146,7 @@ public class SyncRequestProcessor extend
}
}
} catch (Throwable t) {
- LOG.fatal("Severe unrecoverable error, exiting", t);
+ LOG.error("Severe unrecoverable error, exiting", t);
System.exit(11);
}
LOG.info("SyncRequestProcessor exited!");
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java Tue Apr 12 07:14:07 2011
@@ -24,7 +24,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.Map.Entry;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.Watcher.Event.EventType;
@@ -35,7 +36,7 @@ import org.apache.zookeeper.Watcher.Even
* and removes watchers and their watches in addition to managing triggers.
*/
public class WatchManager {
- private static final Logger LOG = Logger.getLogger(WatchManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WatchManager.class);
private final HashMap<String, HashSet<Watcher>> watchTable =
new HashMap<String, HashSet<Watcher>>();
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZKDatabase.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZKDatabase.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZKDatabase.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZKDatabase.java Tue Apr 12 07:14:07 2011
@@ -34,7 +34,8 @@ import org.apache.jute.BinaryOutputArchi
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;
import org.apache.zookeeper.Watcher;
@@ -57,7 +58,7 @@ import org.apache.zookeeper.txn.TxnHeade
*/
public class ZKDatabase {
- private static final Logger LOG = Logger.getLogger(ZKDatabase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ZKDatabase.class);
/**
* make sure on a clear you take care of
@@ -491,4 +492,4 @@ public class ZKDatabase {
this.snapLog.close();
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java Tue Apr 12 07:14:07 2011
@@ -35,7 +35,8 @@ import java.util.concurrent.ConcurrentHa
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.Environment;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.SessionExpiredException;
@@ -65,7 +66,7 @@ public class ZooKeeperServer implements
protected static final Logger LOG;
static {
- LOG = Logger.getLogger(ZooKeeperServer.class);
+ LOG = LoggerFactory.getLogger(ZooKeeperServer.class);
Environment.logEnv("Server environment:", LOG);
}
@@ -260,7 +261,7 @@ public class ZooKeeperServer implements
try {
txnLogFactory.save(zkDb.getDataTree(), zkDb.getSessionWithTimeOuts());
} catch (IOException e) {
- LOG.fatal("Severe unrecoverable error, exiting", e);
+ LOG.error("Severe unrecoverable error, exiting", e);
// This is a severe error that we cannot recover from,
// so we need to exit
System.exit(10);
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.io.IOException;
import javax.management.JMException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.ManagedUtil;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
@@ -33,7 +34,7 @@ import org.apache.zookeeper.server.quoru
*/
public class ZooKeeperServerMain {
private static final Logger LOG =
- Logger.getLogger(ZooKeeperServerMain.class);
+ LoggerFactory.getLogger(ZooKeeperServerMain.class);
private static final String USAGE =
"Usage: ZooKeeperServerMain configfile | port datadir [ticktime] [maxcnxns]";
@@ -50,16 +51,16 @@ public class ZooKeeperServerMain {
try {
main.initializeAndRun(args);
} catch (IllegalArgumentException e) {
- LOG.fatal("Invalid arguments, exiting abnormally", e);
+ LOG.error("Invalid arguments, exiting abnormally", e);
LOG.info(USAGE);
System.err.println(USAGE);
System.exit(2);
} catch (ConfigException e) {
- LOG.fatal("Invalid config, exiting abnormally", e);
+ LOG.error("Invalid config, exiting abnormally", e);
System.err.println("Invalid config, exiting abnormally");
System.exit(2);
} catch (Exception e) {
- LOG.fatal("Unexpected exception, exiting abnormally", e);
+ LOG.error("Unexpected exception, exiting abnormally", e);
System.exit(1);
}
LOG.info("Exiting normally");
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper.server;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.quorum.QuorumPacket;
@@ -57,7 +58,7 @@ public class ZooTrace {
public static void setTextTraceLevel(long mask) {
traceMask = mask;
- Logger LOG = Logger.getLogger(ZooTrace.class);
+ Logger LOG = LoggerFactory.getLogger(ZooTrace.class);
LOG.info("Set text trace mask to 0x" + Long.toHexString(mask));
}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java Tue Apr 12 07:14:07 2011
@@ -21,14 +21,15 @@ package org.apache.zookeeper.server.auth
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Id;
import org.apache.zookeeper.server.ServerCnxn;
public class DigestAuthenticationProvider implements AuthenticationProvider {
private static final Logger LOG =
- Logger.getLogger(DigestAuthenticationProvider.class);
+ LoggerFactory.getLogger(DigestAuthenticationProvider.class);
/** specify a command line property with key of
* "zookeeper.DigestAuthenticationProvider.superDigest"
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java Tue Apr 12 07:14:07 2011
@@ -21,12 +21,13 @@ package org.apache.zookeeper.server.auth
import java.util.Enumeration;
import java.util.HashMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.ZooKeeperServer;
public class ProviderRegistry {
- private static final Logger LOG = Logger.getLogger(ProviderRegistry.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ProviderRegistry.class);
private static boolean initialized = false;
private static HashMap<String, AuthenticationProvider> authenticationProviders =
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileSnap.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileSnap.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileSnap.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileSnap.java Tue Apr 12 07:14:07 2011
@@ -37,7 +37,8 @@ import org.apache.jute.BinaryInputArchiv
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.DataTree;
import org.apache.zookeeper.server.util.SerializeUtils;
@@ -52,7 +53,7 @@ public class FileSnap implements SnapSho
private volatile boolean close = false;
private static final int VERSION=2;
private static final long dbId=-1;
- private static final Logger LOG = Logger.getLogger(FileSnap.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileSnap.class);
public final static int SNAP_MAGIC
= ByteBuffer.wrap("ZKSN".getBytes()).getInt();
public FileSnap(File snapDir) {
@@ -246,4 +247,4 @@ public class FileSnap implements SnapSho
close = true;
}
- }
\ No newline at end of file
+ }
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java Tue Apr 12 07:14:07 2011
@@ -40,7 +40,8 @@ import org.apache.jute.BinaryOutputArchi
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.util.SerializeUtils;
import org.apache.zookeeper.txn.TxnHeader;
@@ -97,7 +98,7 @@ public class FileTxnLog implements TxnLo
public final static int VERSION = 2;
static {
- LOG = Logger.getLogger(FileTxnLog.class);
+ LOG = LoggerFactory.getLogger(FileTxnLog.class);
forceSync =
!System.getProperty("zookeeper.forceSync", "yes").equals("no");
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.server.DataTree;
import org.apache.zookeeper.server.Request;
@@ -52,7 +53,7 @@ public class FileTxnSnapLog {
public final static int VERSION = 2;
public final static String version = "version-";
- private static final Logger LOG = Logger.getLogger(FileTxnSnapLog.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileTxnSnapLog.class);
/**
* This listener helps
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/SnapShot.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/SnapShot.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/SnapShot.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/SnapShot.java Tue Apr 12 07:14:07 2011
@@ -63,4 +63,4 @@ public interface SnapShot {
* @throws IOException
*/
void close() throws IOException;
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java Tue Apr 12 07:14:07 2011
@@ -38,7 +38,8 @@ import org.apache.jute.BinaryOutputArchi
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.txn.TxnHeader;
/**
@@ -46,7 +47,7 @@ import org.apache.zookeeper.txn.TxnHeade
* low level I/O file operations and marshalling/unmarshalling.
*/
public class Util {
- private static final Logger LOG = Logger.getLogger(Util.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Util.class);
private static final String SNAP_DIR="snapDir";
private static final String LOG_DIR="logDir";
private static final String DB_FORMAT_CONV="dbFormatConversion";
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper.server.quorum;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.RequestProcessor;
@@ -29,7 +30,7 @@ import org.apache.zookeeper.server.Reque
* previous stage to the leader as an ACK.
*/
class AckRequestProcessor implements RequestProcessor {
- private static final Logger LOG = Logger.getLogger(AckRequestProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AckRequestProcessor.class);
Leader leader;
AckRequestProcessor(Leader leader) {
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java Tue Apr 12 07:14:07 2011
@@ -36,7 +36,8 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.Random;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.MBeanRegistry;
import org.apache.zookeeper.server.quorum.Election;
@@ -46,7 +47,7 @@ import org.apache.zookeeper.server.quoru
public class AuthFastLeaderElection implements Election {
- private static final Logger LOG = Logger.getLogger(AuthFastLeaderElection.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AuthFastLeaderElection.class);
/* Sequence numbers for messages */
static int sequencer = 0;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java Tue Apr 12 07:14:07 2011
@@ -21,7 +21,8 @@ package org.apache.zookeeper.server.quor
import java.util.ArrayList;
import java.util.LinkedList;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.RequestProcessor;
@@ -33,7 +34,7 @@ import org.apache.zookeeper.server.Reque
* so we need to match them up.
*/
public class CommitProcessor extends Thread implements RequestProcessor {
- private static final Logger LOG = Logger.getLogger(CommitProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CommitProcessor.class);
/**
* Requests that we are holding until the commit comes in.
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java Tue Apr 12 07:14:07 2011
@@ -24,4 +24,4 @@ import org.apache.zookeeper.server.quoru
public interface Election {
public Vote lookForLeader() throws InterruptedException;
public void shutdown();
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java Tue Apr 12 07:14:07 2011
@@ -26,7 +26,8 @@ import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.MBeanRegistry;
import org.apache.zookeeper.server.quorum.QuorumCnxManager.Message;
import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
@@ -46,7 +47,7 @@ import org.apache.zookeeper.server.quoru
public class FastLeaderElection implements Election {
- private static final Logger LOG = Logger.getLogger(FastLeaderElection.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FastLeaderElection.class);
/**
* Determine how much time a process has to wait
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java Tue Apr 12 07:14:07 2011
@@ -68,7 +68,7 @@ public class Follower extends Learner{
//this should never happen but is just a safety check
long lastLoggedZxid = self.getLastLoggedZxid();
if ((newLeaderZxid >> 32L) < (lastLoggedZxid >> 32L)) {
- LOG.fatal("Leader epoch " + Long.toHexString(newLeaderZxid >> 32L)
+ LOG.error("Leader epoch " + Long.toHexString(newLeaderZxid >> 32L)
+ " is less than our epoch " + Long.toHexString(lastLoggedZxid >> 32L));
throw new IOException("Error: Epoch of leader is lower");
}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java Tue Apr 12 07:14:07 2011
@@ -20,7 +20,8 @@ package org.apache.zookeeper.server.quor
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.server.RequestProcessor;
@@ -33,7 +34,7 @@ import org.apache.zookeeper.server.ZooTr
*/
public class FollowerRequestProcessor extends Thread implements
RequestProcessor {
- private static final Logger LOG = Logger.getLogger(FollowerRequestProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FollowerRequestProcessor.class);
FollowerZooKeeperServer zks;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.concurrent.ConcurrentLi
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.FinalRequestProcessor;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.RequestProcessor;
@@ -41,7 +42,7 @@ import org.apache.zookeeper.txn.TxnHeade
*/
public class FollowerZooKeeperServer extends LearnerZooKeeperServer {
private static final Logger LOG =
- Logger.getLogger(FollowerZooKeeperServer.class);
+ LoggerFactory.getLogger(FollowerZooKeeperServer.class);
CommitProcessor commitProcessor;
@@ -109,7 +110,7 @@ public class FollowerZooKeeperServer ext
}
long firstElementZxid = pendingTxns.element().zxid;
if (firstElementZxid != zxid) {
- LOG.fatal("Committing zxid 0x" + Long.toHexString(zxid)
+ LOG.error("Committing zxid 0x" + Long.toHexString(zxid)
+ " but next pending txn 0x"
+ Long.toHexString(firstElementZxid));
System.exit(12);
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Tue Apr 12 07:14:07 2011
@@ -37,7 +37,8 @@ import java.util.concurrent.ConcurrentLi
import java.util.concurrent.ConcurrentMap;
import org.apache.jute.BinaryOutputArchive;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.FinalRequestProcessor;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.RequestProcessor;
@@ -47,7 +48,7 @@ import org.apache.zookeeper.server.quoru
* This class has the control logic for the Leader.
*/
public class Leader {
- private static final Logger LOG = Logger.getLogger(Leader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Leader.class);
static final private boolean nodelay = System.getProperty("leader.nodelay", "true").equals("true");
static {
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java Tue Apr 12 07:14:07 2011
@@ -31,7 +31,8 @@ import java.util.Iterator;
import java.util.Random;
import java.util.Map.Entry;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.MBeanRegistry;
import org.apache.zookeeper.server.quorum.Vote;
@@ -40,7 +41,7 @@ import org.apache.zookeeper.server.quoru
import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState;
public class LeaderElection implements Election {
- private static final Logger LOG = Logger.getLogger(LeaderElection.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LeaderElection.class);
protected static final Random epochGen = new Random();
protected QuorumPeer self;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java Tue Apr 12 07:14:07 2011
@@ -37,7 +37,8 @@ import org.apache.jute.BinaryOutputArchi
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.ServerCnxn;
import org.apache.zookeeper.server.ZooTrace;
@@ -73,7 +74,7 @@ public class Learner {
protected InputArchive leaderIs;
protected OutputArchive leaderOs;
- protected static final Logger LOG = Logger.getLogger(Learner.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(Learner.class);
static final private boolean nodelay = System.getProperty("follower.nodelay", "true").equals("true");
static {
@@ -307,14 +308,14 @@ public class Learner {
boolean truncated=zk.getZKDatabase().truncateLog(qp.getZxid());
if (!truncated) {
// not able to truncate the log
- LOG.fatal("Not able to truncate the log "
+ LOG.error("Not able to truncate the log "
+ Long.toHexString(qp.getZxid()));
System.exit(13);
}
}
else {
- LOG.fatal("Got unexpected packet from leader "
+ LOG.error("Got unexpected packet from leader "
+ qp.getType() + " exiting ... " );
System.exit(13);
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java Tue Apr 12 07:14:07 2011
@@ -35,7 +35,8 @@ import java.util.concurrent.locks.Reentr
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException.SessionExpiredException;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.server.Request;
@@ -51,7 +52,7 @@ import org.apache.zookeeper.txn.TxnHeade
* class.
*/
public class LearnerHandler extends Thread {
- private static final Logger LOG = Logger.getLogger(LearnerHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LearnerHandler.class);
protected final Socket sock;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java Tue Apr 12 07:14:07 2011
@@ -20,7 +20,8 @@ package org.apache.zookeeper.server.quor
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.server.RequestProcessor;
@@ -33,7 +34,7 @@ import org.apache.zookeeper.server.ZooTr
*/
public class ObserverRequestProcessor extends Thread implements
RequestProcessor {
- private static final Logger LOG = Logger.getLogger(ObserverRequestProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ObserverRequestProcessor.class);
ObserverZooKeeperServer zks;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java Tue Apr 12 07:14:07 2011
@@ -20,7 +20,8 @@ package org.apache.zookeeper.server.quor
import java.io.IOException;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.FinalRequestProcessor;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.RequestProcessor;
@@ -35,7 +36,7 @@ import org.apache.zookeeper.server.persi
*/
public class ObserverZooKeeperServer extends LearnerZooKeeperServer {
private static final Logger LOG =
- Logger.getLogger(ObserverZooKeeperServer.class);
+ LoggerFactory.getLogger(ObserverZooKeeperServer.class);
/*
* Request processors
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper.server.quorum;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.RequestProcessor;
import org.apache.zookeeper.server.SyncRequestProcessor;
@@ -30,7 +31,7 @@ import org.apache.zookeeper.server.ZooKe
*/
public class ProposalRequestProcessor implements RequestProcessor {
private static final Logger LOG =
- Logger.getLogger(ProposalRequestProcessor.class);
+ LoggerFactory.getLogger(ProposalRequestProcessor.class);
LeaderZooKeeperServer zks;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java Tue Apr 12 07:14:07 2011
@@ -35,7 +35,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.Date;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class implements a connection manager for leader election using TCP. It
@@ -58,7 +59,7 @@ import org.apache.log4j.Logger;
*/
public class QuorumCnxManager {
- private static final Logger LOG = Logger.getLogger(QuorumCnxManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumCnxManager.class);
/*
* Maximum capacity of thread queues
@@ -515,7 +516,7 @@ public class QuorumCnxManager {
}
LOG.info("Leaving listener");
if (!shutdown) {
- LOG.fatal("As I'm leaving the listener thread, "
+ LOG.error("As I'm leaving the listener thread, "
+ "I won't be able to participate in leader "
+ "election any longer: "
+ self.quorumPeers.get(self.getId()).electionAddr);
@@ -621,7 +622,7 @@ public class QuorumCnxManager {
b.position(0);
b.get(msgBytes);
} catch (BufferUnderflowException be) {
- LOG.fatal("BufferUnderflowException ", be);
+ LOG.error("BufferUnderflowException ", be);
return;
}
dout.writeInt(b.capacity());
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Tue Apr 12 07:14:07 2011
@@ -31,7 +31,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.MBeanRegistry;
import org.apache.zookeeper.jmx.ZKMBeanInfo;
import org.apache.zookeeper.server.ServerCnxnFactory;
@@ -69,7 +70,7 @@ import org.apache.zookeeper.server.quoru
* The request for the current leader will consist solely of an xid: int xid;
*/
public class QuorumPeer extends Thread implements QuorumStats.Provider {
- private static final Logger LOG = Logger.getLogger(QuorumPeer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumPeer.class);
QuorumBean jmxQuorumBean;
LocalPeerBean jmxLocalPeerBean;
@@ -390,7 +391,7 @@ public class QuorumPeer extends Thread i
try {
zkDb.loadDataBase();
} catch(IOException ie) {
- LOG.fatal("Unable to load database on disk", ie);
+ LOG.error("Unable to load database on disk", ie);
throw new RuntimeException("Unable to run quorum server ", ie);
}
cnxnFactory.start();
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java Tue Apr 12 07:14:07 2011
@@ -31,8 +31,9 @@ import java.util.Map;
import java.util.Properties;
import java.util.Map.Entry;
-import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
@@ -42,7 +43,7 @@ import org.apache.zookeeper.server.quoru
import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier;
public class QuorumPeerConfig {
- private static final Logger LOG = Logger.getLogger(QuorumPeerConfig.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumPeerConfig.class);
protected InetSocketAddress clientPortAddress;
protected String dataDir;
@@ -331,7 +332,7 @@ public class QuorumPeerConfig {
}
try {
serverId = Long.parseLong(myIdString);
- MDC.put("myid", serverId);
+ MDC.put("myid", myIdString);
} catch (NumberFormatException e) {
throw new IllegalArgumentException("serverid " + myIdString
+ " is not a number");
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.io.IOException;
import javax.management.JMException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.ManagedUtil;
import org.apache.zookeeper.server.ServerCnxnFactory;
import org.apache.zookeeper.server.ZKDatabase;
@@ -59,7 +60,7 @@ import org.apache.zookeeper.server.quoru
*
*/
public class QuorumPeerMain {
- private static final Logger LOG = Logger.getLogger(QuorumPeerMain.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumPeerMain.class);
private static final String USAGE = "Usage: QuorumPeerMain configfile";
@@ -75,16 +76,16 @@ public class QuorumPeerMain {
try {
main.initializeAndRun(args);
} catch (IllegalArgumentException e) {
- LOG.fatal("Invalid arguments, exiting abnormally", e);
+ LOG.error("Invalid arguments, exiting abnormally", e);
LOG.info(USAGE);
System.err.println(USAGE);
System.exit(2);
} catch (ConfigException e) {
- LOG.fatal("Invalid config, exiting abnormally", e);
+ LOG.error("Invalid config, exiting abnormally", e);
System.err.println("Invalid config, exiting abnormally");
System.exit(2);
} catch (Exception e) {
- LOG.fatal("Unexpected exception, exiting abnormally", e);
+ LOG.error("Unexpected exception, exiting abnormally", e);
System.exit(1);
}
LOG.info("Exiting normally");
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java Tue Apr 12 07:14:07 2011
@@ -21,14 +21,15 @@ package org.apache.zookeeper.server.quor
import java.io.Flushable;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.RequestProcessor;
public class SendAckRequestProcessor implements RequestProcessor, Flushable {
- private static final Logger LOG = Logger.getLogger(SendAckRequestProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SendAckRequestProcessor.class);
Learner learner;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Vote.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Vote.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Vote.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Vote.java Tue Apr 12 07:14:07 2011
@@ -66,4 +66,4 @@ public class Vote {
public String toString() {
return "(" + id + ", " + Long.toHexString(zxid) + ")";
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java Tue Apr 12 07:14:07 2011
@@ -29,7 +29,8 @@ import java.util.Properties;
import java.util.Map.Entry;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
@@ -64,7 +65,7 @@ import org.apache.zookeeper.server.quoru
*/
public class QuorumHierarchical implements QuorumVerifier {
- private static final Logger LOG = Logger.getLogger(QuorumHierarchical.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumHierarchical.class);
HashMap<Long, Long> serverWeight;
HashMap<Long, Long> serverGroup;
@@ -269,4 +270,4 @@ public class QuorumHierarchical implemen
return false;
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java Tue Apr 12 07:14:07 2011
@@ -54,4 +54,4 @@ public class QuorumMaj implements Quorum
return (set.size() > half);
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java Tue Apr 12 07:14:07 2011
@@ -30,4 +30,4 @@ import java.util.HashSet;
public interface QuorumVerifier {
long getWeight(long id);
boolean containsQuorum(HashSet<Long> set);
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java Tue Apr 12 07:14:07 2011
@@ -30,7 +30,8 @@ import java.util.concurrent.ConcurrentHa
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.KeeperException.Code;
@@ -59,7 +60,7 @@ import org.apache.zookeeper.txn.TxnHeade
* through the hashtable. The tree is traversed only when serializing to disk.
*/
public class DataTreeV1 {
- private static final Logger LOG = Logger.getLogger(DataTreeV1.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataTreeV1.class);
/**
* This hashtable provides a fast lookup to the datanodes. The tree is the
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeMain.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeMain.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeMain.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeMain.java Tue Apr 12 07:14:07 2011
@@ -21,7 +21,8 @@ package org.apache.zookeeper.server.upgr
import java.io.File;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.DataTree;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
@@ -43,7 +44,7 @@ public class UpgradeMain {
File currentdataDir;
File currentsnapShotDir;
- private static final Logger LOG = Logger.getLogger(UpgradeMain.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UpgradeMain.class);
private static final String USAGE = "Usage: UpgradeMain dataDir snapShotDir";
private static final int LASTVERSION = 1;
private static final int CURRENTVERSION = FileTxnSnapLog.VERSION;
@@ -177,4 +178,4 @@ public class UpgradeMain {
"docs for manual failure recovery ", th);
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java Tue Apr 12 07:14:07 2011
@@ -30,4 +30,4 @@ import org.apache.zookeeper.server.DataT
public interface UpgradeSnapShot {
public DataTree getNewDataTree() throws IOException;
public ConcurrentHashMap<Long, Integer> getSessionWithTimeOuts();
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java Tue Apr 12 07:14:07 2011
@@ -33,7 +33,8 @@ import java.util.concurrent.ConcurrentHa
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.InputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.data.StatPersisted;
import org.apache.zookeeper.data.StatPersistedV1;
@@ -55,7 +56,7 @@ import org.apache.zookeeper.txn.TxnHeade
* for upgrading.
*/
public class UpgradeSnapShotV1 implements UpgradeSnapShot {
- private static final Logger LOG = Logger.getLogger(UpgradeSnapShotV1.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UpgradeSnapShotV1.class);
ConcurrentHashMap<Long, Integer> sessionsWithTimeouts =
new ConcurrentHashMap<Long, Integer>();
@@ -330,4 +331,4 @@ public class UpgradeSnapShotV1 implement
public ConcurrentHashMap<Long, Integer> getSessionWithTimeOuts() {
return this.sessionsWithTimeouts;
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/Profiler.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/Profiler.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/Profiler.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/Profiler.java Tue Apr 12 07:14:07 2011
@@ -18,10 +18,11 @@
package org.apache.zookeeper.server.util;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Profiler {
- private static final Logger LOG = Logger.getLogger(Profiler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Profiler.class);
public interface Operation<T> {
public T execute() throws Exception;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/SerializeUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/SerializeUtils.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/SerializeUtils.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/SerializeUtils.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
@@ -40,7 +41,7 @@ import org.apache.zookeeper.txn.SetDataT
import org.apache.zookeeper.txn.TxnHeader;
public class SerializeUtils {
- private static final Logger LOG = Logger.getLogger(SerializeUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SerializeUtils.class);
public static Record deserializeTxn(InputArchive ia, TxnHeader hdr)
throws IOException {
Modified: zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java (original)
+++ zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java Tue Apr 12 07:14:07 2011
@@ -40,7 +40,8 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.AsyncCallback.DataCallback;
import org.apache.zookeeper.AsyncCallback.StatCallback;
import org.apache.zookeeper.KeeperException;
@@ -54,7 +55,7 @@ import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.WatchedEvent;
public class GenerateLoad {
- protected static final Logger LOG = Logger.getLogger(GenerateLoad.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(GenerateLoad.class);
static ServerSocket ss;
Modified: zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceContainer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceContainer.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceContainer.java (original)
+++ zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceContainer.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.AsyncCallback;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
@@ -104,7 +105,7 @@ public class InstanceContainer implement
}
}
}
- private static final Logger LOG = Logger.getLogger(InstanceContainer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InstanceContainer.class);
String name;
String zkHostPort;
// We only run if the readyNode exists
@@ -215,7 +216,7 @@ public class InstanceContainer implement
public void process(WatchedEvent event) {
if (KeeperState.Expired == event.getState()) {
// It's all over
- LOG.fatal("Lost session");
+ LOG.error("Lost session");
System.exit(4);
}
if (event.getPath() != null && event.getPath().equals(assignmentsNode)) {
Modified: zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceManager.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceManager.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceManager.java (original)
+++ zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceManager.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.AsyncCallback;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
@@ -51,7 +52,7 @@ import org.apache.zookeeper.data.Stat;
* running. it will have the report string from the instance.
*/
public class InstanceManager implements AsyncCallback.ChildrenCallback, Watcher {
- final private static Logger LOG = Logger.getLogger(InstanceManager.class);
+ final private static Logger LOG = LoggerFactory.getLogger(InstanceManager.class);
private ZooKeeper zk;
private String prefixNode;
private String reportsNode = "reports";
Modified: zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java (original)
+++ zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java Tue Apr 12 07:14:07 2011
@@ -28,13 +28,14 @@ import java.net.Socket;
import java.util.HashMap;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.server.quorum.QuorumPeer;
import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
class QuorumPeerInstance implements Instance {
- final private static Logger LOG = Logger.getLogger(QuorumPeerInstance.class);
+ final private static Logger LOG = LoggerFactory.getLogger(QuorumPeerInstance.class);
private static final int syncLimit = 3;
private static final int initLimit = 3;
private static final int tickTime = 2000;
Modified: zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleSysTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleSysTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleSysTest.java (original)
+++ zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleSysTest.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper.test.system;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -41,7 +42,7 @@ import org.junit.Test;
public class SimpleSysTest extends BaseSysTest implements Watcher {
int maxTries = 10;
boolean connected;
- final private static Logger LOG = Logger.getLogger(SimpleSysTest.class);
+ final private static Logger LOG = LoggerFactory.getLogger(SimpleSysTest.class);
synchronized private boolean waitForConnect(ZooKeeper zk, long timeout) throws InterruptedException {
connected = (zk.getState() == States.CONNECTED);
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.internal.runners.statements.InvokeMethod;
import org.junit.runners.BlockJUnit4ClassRunner;
import org.junit.runners.model.FrameworkMethod;
@@ -30,7 +31,7 @@ import org.junit.runners.model.Statement
* starts and when it finishes.
*/
public class JUnit4ZKTestRunner extends BlockJUnit4ClassRunner {
- private static final Logger LOG = Logger.getLogger(JUnit4ZKTestRunner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JUnit4ZKTestRunner.class);
public JUnit4ZKTestRunner(Class<?> klass) throws InitializationError {
super(klass);
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/PortAssignment.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/PortAssignment.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/PortAssignment.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/PortAssignment.java Tue Apr 12 07:14:07 2011
@@ -18,11 +18,12 @@
package org.apache.zookeeper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** Assign ports to tests */
public class PortAssignment {
- private static final Logger LOG = Logger.getLogger(PortAssignment.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortAssignment.class);
private static int nextPort = 11221;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/ZKTestCase.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/ZKTestCase.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/ZKTestCase.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/ZKTestCase.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Rule;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
@@ -33,7 +34,7 @@ import org.junit.runners.model.Framework
*/
@RunWith(JUnit4ZKTestRunner.class)
public class ZKTestCase {
- private static final Logger LOG = Logger.getLogger(ZKTestCase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ZKTestCase.class);
private String testName;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/CRCTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/CRCTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/CRCTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/CRCTest.java Tue Apr 12 07:14:07 2011
@@ -35,7 +35,8 @@ import java.util.zip.CheckedInputStream;
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.InputArchive;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.WatchedEvent;
@@ -52,7 +53,7 @@ import org.junit.Assert;
import org.junit.Test;
public class CRCTest extends ZKTestCase implements Watcher {
- private static final Logger LOG = Logger.getLogger(CRCTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CRCTest.class);
private static final String HOSTPORT =
"127.0.0.1:" + PortAssignment.unique();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java Tue Apr 12 07:14:07 2011
@@ -24,14 +24,15 @@ import java.io.IOException;
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZKTestCase;
import org.junit.Assert;
import org.junit.Test;
public class DeserializationPerfTest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(DeserializationPerfTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(DeserializationPerfTest.class);
private static void deserializeTree(int depth, int width, int len)
throws InterruptedException, IOException, KeeperException.NodeExistsException, KeeperException.NoNodeException {
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java Tue Apr 12 07:14:07 2011
@@ -21,7 +21,8 @@ package org.apache.zookeeper.server;
import java.io.File;
import java.io.RandomAccessFile;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.WatchedEvent;
@@ -41,7 +42,7 @@ import org.junit.Test;
*/
public class InvalidSnapshotTest extends ZKTestCase implements Watcher {
private static final Logger LOG =
- Logger.getLogger(InvalidSnapshotTest.class);
+ LoggerFactory.getLogger(InvalidSnapshotTest.class);
private static final String HOSTPORT =
"127.0.0.1:" + PortAssignment.unique();
@@ -108,4 +109,4 @@ public class InvalidSnapshotTest extends
// do nothing for now
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java Tue Apr 12 07:14:07 2011
@@ -22,13 +22,14 @@ import java.io.IOException;
import java.io.OutputStream;
import org.apache.jute.BinaryOutputArchive;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZKTestCase;
import org.junit.Test;
public class SerializationPerfTest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(SerializationPerfTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(SerializationPerfTest.class);
private static class NullOutputStream extends OutputStream {
public void write(int b) {
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java Tue Apr 12 07:14:07 2011
@@ -24,7 +24,8 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -41,7 +42,7 @@ import org.junit.Test;
*/
public class ZooKeeperServerMainTest extends ZKTestCase implements Watcher {
protected static final Logger LOG =
- Logger.getLogger(ZooKeeperServerMainTest.class);
+ LoggerFactory.getLogger(ZooKeeperServerMainTest.class);
public static class MainThread extends Thread {
final File confFile;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZKTestCase;
@@ -38,7 +39,7 @@ import org.apache.zookeeper.test.QuorumB
*/
public class QuorumPeerTestBase extends ZKTestCase implements Watcher {
protected static final Logger LOG =
- Logger.getLogger(QuorumPeerTestBase.class);
+ LoggerFactory.getLogger(QuorumPeerTestBase.class);
public void process(WatchedEvent event) {
// ignore for this test