Merge pull request #474 from stonelion/master

修改为log4j2-slf4j api

src/main/java/demo/catlets/BatchInsertSequence.java

@@ -1,5 +1,11 @@
 package demo.catlets;
 
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
+import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
 import io.mycat.MycatServer;
 import io.mycat.cache.LayerCachePool;
 import io.mycat.route.RouteResultset;
@@ -17,23 +23,17 @@
 import io.mycat.sqlengine.Catlet;
 import io.mycat.sqlengine.EngineCtx;
 import io.mycat.util.StringUtil;
-
-import org.apache.log4j.Logger;
-
-import com.alibaba.druid.sql.ast.SQLStatement;
-import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
-import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
-import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause;
-import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
-import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 执行批量插入sequence Id
  * @author 兵临城下
  * @date 2015/03/20
  */
 public class BatchInsertSequence implements Catlet {
-	private static final Logger LOGGER = Logger.getLogger(BatchInsertSequence.class);
+	private static final Logger LOGGER = LoggerFactory
+			.getLogger(BatchInsertSequence.class);
 
 	private RouteResultset rrs;//路由结果集
 	private String executeSql;//接收执行处理任务的sql

src/main/java/io/mycat/MycatServer.java

@@ -23,29 +23,25 @@
  */
 package io.mycat;
 
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
 import io.mycat.backend.PhysicalDBPool;
 import io.mycat.cache.CacheService;
-import io.mycat.net.BufferPool;
-import io.mycat.net.ExecutorUtil;
-import io.mycat.net.NIOAcceptor;
-import io.mycat.net.NIOConnector;
-import io.mycat.net.NIOReactorPool;
-import io.mycat.net.NameableExecutor;
-import io.mycat.net.NamebleScheduledExecutor;
-import io.mycat.net.NetSystem;
+import io.mycat.net.*;
 import io.mycat.route.MyCATSequnceProcessor;
 import io.mycat.route.RouteService;
 import io.mycat.server.MySQLFrontConnectionFactory;
 import io.mycat.server.MySQLFrontConnectionHandler;
 import io.mycat.server.classloader.DynaClassLoader;
 import io.mycat.server.config.ConfigException;
-import io.mycat.server.config.Log4jInitializer;
 import io.mycat.server.config.cluster.ClusterSync;
 import io.mycat.server.config.loader.ConfigFactory;
 import io.mycat.server.config.node.MycatConfig;
 import io.mycat.server.config.node.SystemConfig;
 import io.mycat.server.interceptor.SQLInterceptor;
 import io.mycat.util.TimeUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -56,11 +52,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.log4j.Logger;
-
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-
 /**
  * @author mycat
  */
@@ -69,7 +60,7 @@ public class MycatServer {
 	private static final long LOG_WATCH_DELAY = 60000L;
 	private static final long TIME_UPDATE_PERIOD = 20L;
 	private static final MycatServer INSTANCE = new MycatServer();
-	private static final Logger LOGGER = Logger.getLogger("MycatServer");
+	private static final Logger LOGGER = LoggerFactory.getLogger("MycatServer");
 	private final RouteService routerService;
 	private final CacheService cacheService;
 	private AsynchronousChannelGroup[] asyncChannelGroups;
@@ -163,12 +154,6 @@ public MycatConfig getConfig() {
 		return config;
 	}
 
-	public void beforeStart() {
-		String home = SystemConfig.getHomePath();
-		Log4jInitializer.configureAndWatch(home + "/conf/log4j.xml",
-				LOG_WATCH_DELAY);
-	}
-
 	public void startup() throws IOException {
 
 		SystemConfig system = config.getSystem();

src/main/java/io/mycat/MycatStartup.java

@@ -24,18 +24,23 @@
 package io.mycat;
 
 import io.mycat.server.config.node.SystemConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.apache.log4j.helpers.LogLog;
-
 /**
  * @author mycat
  */
 public final class MycatStartup {
 	private static final String dateFormat = "yyyy-MM-dd HH:mm:ss";
 
+	private static final class Holder {
+		private static final Logger LOGGER = LoggerFactory
+				.getLogger(MycatStartup.class);
+	}
+
 	public static void main(String[] args) {
 		try {
 			String home = SystemConfig.getHomePath();
@@ -45,7 +50,6 @@ public static void main(String[] args) {
 			}
 			// init
 			MycatServer server = MycatServer.getInstance();
-			server.beforeStart();
 
 			// startup
 			server.startup();
@@ -55,7 +59,7 @@ public static void main(String[] args) {
 			}
 		} catch (Exception e) {
 			SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
-			LogLog.error(sdf.format(new Date()) + " startup error", e);
+			Holder.LOGGER.error(sdf.format(new Date()) + " startup error", e);
 			System.exit(-1);
 		}
 	}

src/main/java/io/mycat/backend/PhysicalDBNode.java

@@ -25,11 +25,11 @@
 
 import io.mycat.route.RouteResultsetNode;
 import io.mycat.server.executors.ResponseHandler;
-
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PhysicalDBNode {
-	protected static final Logger LOGGER = Logger
+	protected static final Logger LOGGER = LoggerFactory
 			.getLogger(PhysicalDBNode.class);
 
 	protected final String name;

src/main/java/io/mycat/backend/PhysicalDBPool.java

@@ -29,18 +29,13 @@
 import io.mycat.server.config.node.DataHostConfig;
 import io.mycat.server.executors.GetConnectionHandler;
 import io.mycat.server.executors.ResponseHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.log4j.Logger;
-
 public class PhysicalDBPool {
     public static final int BALANCE_NONE = 0;
     public static final int BALANCE_ALL_BACK = 1;
@@ -51,7 +46,7 @@ public class PhysicalDBPool {
     public static final int WRITE_ALL_NODE = 2;
     public static final long LONG_TIME = 300000;
 
-    protected static final Logger LOGGER = Logger
+    protected static final Logger LOGGER = LoggerFactory
             .getLogger(PhysicalDBPool.class);
     private final String hostName;
     protected PhysicalDatasource[] writeSources;

src/main/java/io/mycat/backend/PhysicalDatasource.java

@@ -33,6 +33,8 @@
 import io.mycat.server.executors.NewConnectionRespHandler;
 import io.mycat.server.executors.ResponseHandler;
 import io.mycat.util.TimeUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,10 +43,8 @@
 import java.util.List;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.log4j.Logger;
-
 public abstract class PhysicalDatasource {
-    private static final Logger LOGGER = Logger
+    public static final Logger LOGGER = LoggerFactory
             .getLogger(PhysicalDatasource.class);
 
     private final String name;

src/main/java/io/mycat/backend/heartbeat/MySQLHeartbeat.java

@@ -27,20 +27,21 @@
 import io.mycat.backend.PhysicalDBPool;
 import io.mycat.backend.PhysicalDatasource;
 import io.mycat.server.config.node.DataHostConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.log4j.Logger;
-
 /**
  * @author mycat
  */
 public class MySQLHeartbeat extends DBHeartbeat {
 
 	private static final int MAX_RETRY_COUNT = 5;
-	public static final Logger LOGGER = Logger.getLogger(MySQLHeartbeat.class);
+	public static final Logger LOGGER = LoggerFactory
+			.getLogger(MySQLHeartbeat.class);
 
 	private final MySQLDataSource source;
 

src/main/java/io/mycat/backend/jdbc/JDBCConnection.java

@@ -9,17 +9,14 @@
 import io.mycat.server.MySQLFrontConnection;
 import io.mycat.server.executors.ConnectionHeartBeatHandler;
 import io.mycat.server.executors.ResponseHandler;
-import io.mycat.server.packet.EOFPacket;
-import io.mycat.server.packet.ErrorPacket;
-import io.mycat.server.packet.FieldPacket;
-import io.mycat.server.packet.OkPacket;
-import io.mycat.server.packet.ResultSetHeaderPacket;
-import io.mycat.server.packet.RowDataPacket;
+import io.mycat.server.packet.*;
 import io.mycat.server.parser.ServerParse;
 import io.mycat.server.response.ShowVariables;
 import io.mycat.util.ResultSetUtil;
 import io.mycat.util.StringUtil;
 import io.mycat.util.TimeUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -32,10 +29,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 public class JDBCConnection implements BackendConnection {
-	protected static final Logger LOGGER = Logger
+	protected static final Logger LOGGER = LoggerFactory
 			.getLogger(JDBCConnection.class);
 	private JDBCDatasource pool;
 	private volatile String schema;

src/main/java/io/mycat/backend/jdbc/JDBCHeartbeat.java

@@ -2,24 +2,25 @@
 
 import io.mycat.backend.HeartbeatRecorder;
 import io.mycat.backend.heartbeat.DBHeartbeat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.sql.Statement;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.log4j.Logger;
-
 public class JDBCHeartbeat extends DBHeartbeat{
 	private final ReentrantLock lock;
 	private final JDBCDatasource source;
     private final boolean heartbeatnull;
     private Long lastSendTime = System.currentTimeMillis();
     private Long lastReciveTime = System.currentTimeMillis();
-
-
-    private Logger logger = Logger.getLogger(this.getClass());
+
+
+	private static final Logger logger = LoggerFactory
+			.getLogger(JDBCHeartbeat.class);
 
 	public JDBCHeartbeat(JDBCDatasource source)
 	{

src/main/java/io/mycat/backend/nio/MySQLBackendConnectionHandler.java

@@ -7,27 +7,21 @@
 import io.mycat.server.Capabilities;
 import io.mycat.server.executors.LoadDataResponseHandler;
 import io.mycat.server.executors.ResponseHandler;
-import io.mycat.server.packet.EOFPacket;
-import io.mycat.server.packet.ErrorPacket;
-import io.mycat.server.packet.HandshakePacket;
-import io.mycat.server.packet.OkPacket;
-import io.mycat.server.packet.Reply323Packet;
-import io.mycat.server.packet.RequestFilePacket;
-import io.mycat.server.packet.ResultStatus;
+import io.mycat.server.packet.*;
 import io.mycat.server.packet.util.ByteUtil;
 import io.mycat.server.packet.util.CharsetUtil;
 import io.mycat.server.packet.util.SecurityUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
-import org.apache.log4j.Logger;
-
 public class MySQLBackendConnectionHandler implements
 		NIOHandler<MySQLBackendConnection> {
 
-	private static final Logger LOGGER = Logger
+	private static final Logger LOGGER = LoggerFactory
 			.getLogger(MySQLBackendConnectionHandler.class);
 	private static final int RESULT_STATUS_INIT = 0;
 	private static final int RESULT_STATUS_HEADER = 1;

src/main/java/io/mycat/cache/CacheService.java

@@ -23,21 +23,23 @@
  */
 package io.mycat.cache;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.log4j.Logger;
-
 /**
  * cache service for other component default using memory cache encache
  *
  * @author wuzhih
  *
  */
 public class CacheService {
-	private static final Logger logger = Logger.getLogger(CacheService.class);
+    private static final Logger logger = LoggerFactory
+            .getLogger(CacheService.class);
 
 	private final Map<String, CachePoolFactory> poolFactorys = new HashMap<String, CachePoolFactory>();
 	private final Map<String, CachePool> allPools = new HashMap<String, CachePool>();

src/main/java/io/mycat/cache/DefaultLayedCachePool.java

@@ -23,14 +23,15 @@
  */
 package io.mycat.cache;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.log4j.Logger;
-
 public class DefaultLayedCachePool implements LayerCachePool {
-	private static final Logger LOGGER = Logger
+	private static final Logger LOGGER = LoggerFactory
 			.getLogger(DefaultLayedCachePool.class);
 	protected Map<String, CachePool> allCaches = new HashMap<String, CachePool>();
 	protected final ReentrantLock lock = new ReentrantLock();