From 9aa84283899dc465acde57f11f7e8707d4ea45ac Mon Sep 17 00:00:00 2001 From: liubing44 Date: Mon, 16 Jan 2017 22:06:54 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7self4j=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nredis-proxy-bootstrap/log/nredis-proxy.log | 24 +++++++++++++++++++ .../core/client/impl/AbstractPoolClient.java | 11 ++++----- pom.xml | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 nredis-proxy-bootstrap/log/nredis-proxy.log diff --git a/nredis-proxy-bootstrap/log/nredis-proxy.log b/nredis-proxy-bootstrap/log/nredis-proxy.log new file mode 100644 index 0000000..582ba94 --- /dev/null +++ b/nredis-proxy-bootstrap/log/nredis-proxy.log @@ -0,0 +1,24 @@ +[VAMS][2017-01-16 22:05:50,139] INFO | Refreshing org.springframework.context.support.ClassPathXmlApplicationContext@928b33a: startup date [Mon Jan 16 22:05:50 CST 2017]; root of context hierarchy | [main] org.springframework.context.support.AbstractApplicationContext.prepareRefresh(510) +[VAMS][2017-01-16 22:05:50,195] INFO | Loading XML bean definitions from URL [file:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-bootstrap/target/classes/redisProxy.xml] | [main] org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(317) +[VAMS][2017-01-16 22:05:50,519] INFO | Starting ZkClient event thread. | [ZkClient-EventThread-8-127.0.0.1:2181] org.I0Itec.zkclient.ZkEventThread.run(64) +[VAMS][2017-01-16 22:05:51,141] INFO | Client environment:zookeeper.version=3.4.8--1, built on 02/06/2016 03:18 GMT | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,142] INFO | Client environment:host.name=192.168.0.5 | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,142] INFO | Client environment:java.version=1.7.0_71 | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,142] INFO | Client environment:java.vendor=Oracle Corporation | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,143] INFO | Client environment:java.home=/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home/jre | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,143] INFO | Client environment:java.class.path=/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-bootstrap/target/classes:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-spring/target/classes:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-net/target/classes:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-core/target/classes:/Users/liubing/.m2/repository/io/netty/netty-all/4.1.6.Final/netty-all-4.1.6.Final.jar:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-commons/target/classes:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-pool/target/classes:/Users/liubing/.m2/repository/com/alibaba/fastjson/1.2.4/fastjson-1.2.4.jar:/Users/liubing/.m2/repository/com/101tec/zkclient/0.3/zkclient-0.3.jar:/Users/liubing/.m2/repository/org/apache/zookeeper/zookeeper/3.4.8/zookeeper-3.4.8.jar:/Users/liubing/.m2/repository/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar:/Users/liubing/.m2/repository/jline/jline/0.9.94/jline-0.9.94.jar:/Users/liubing/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar:/Users/liubing/.m2/repository/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar:/Users/liubing/.m2/repository/org/springframework/spring-context/4.1.7.RELEASE/spring-context-4.1.7.RELEASE.jar:/Users/liubing/.m2/repository/org/springframework/spring-aop/4.1.7.RELEASE/spring-aop-4.1.7.RELEASE.jar:/Users/liubing/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:/Users/liubing/.m2/repository/org/springframework/spring-beans/4.1.7.RELEASE/spring-beans-4.1.7.RELEASE.jar:/Users/liubing/.m2/repository/org/springframework/spring-core/4.1.7.RELEASE/spring-core-4.1.7.RELEASE.jar:/Users/liubing/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:/Users/liubing/.m2/repository/org/springframework/spring-expression/4.1.7.RELEASE/spring-expression-4.1.7.RELEASE.jar | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,144] INFO | Client environment:java.library.path=/Users/liubing/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:. | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,144] INFO | Client environment:java.io.tmpdir=/var/folders/g8/z6zm23pj75g9l7lz3cmrmy0h0000gn/T/ | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,144] INFO | Client environment:java.compiler= | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,144] INFO | Client environment:os.name=Mac OS X | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,145] INFO | Client environment:os.arch=x86_64 | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,145] INFO | Client environment:os.version=10.10.3 | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,145] INFO | Client environment:user.name=liubing | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,146] INFO | Client environment:user.home=/Users/liubing | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,146] INFO | Client environment:user.dir=/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-bootstrap | [main] org.apache.zookeeper.Environment.logEnv(100) +[VAMS][2017-01-16 22:05:51,147] INFO | Initiating client connection, connectString=127.0.0.1:2181 sessionTimeout=60000 watcher=org.I0Itec.zkclient.ZkClient@68f4055f | [main] org.apache.zookeeper.ZooKeeper.(438) +[VAMS][2017-01-16 22:05:51,165] INFO | Opening socket connection to server 127.0.0.1/127.0.0.1:2181. Will not attempt to authenticate using SASL (unknown error) | [main-SendThread(127.0.0.1:2181)] org.apache.zookeeper.ClientCnxn$SendThread.logStartConnect(1032) +[VAMS][2017-01-16 22:05:51,171] INFO | Socket connection established to 127.0.0.1/127.0.0.1:2181, initiating session | [main-SendThread(127.0.0.1:2181)] org.apache.zookeeper.ClientCnxn$SendThread.primeConnection(876) +[VAMS][2017-01-16 22:05:51,188] INFO | Session establishment complete on server 127.0.0.1/127.0.0.1:2181, sessionid = 0x1598c67bdbe0145, negotiated timeout = 40000 | [main-SendThread(127.0.0.1:2181)] org.apache.zookeeper.ClientCnxn$SendThread.onConnected(1299) +[VAMS][2017-01-16 22:05:51,190] INFO | zookeeper state changed (SyncConnected) | [main-EventThread] org.I0Itec.zkclient.ZkClient.processStateChanged(449) +[VAMS][2017-01-16 22:05:51,754] INFO | RedisProxy_Server 已经启动 | [main] com.opensource.netty.redis.proxy.net.server.LBRedisServer.start(148) diff --git a/nredis-proxy-core/src/main/java/com/opensource/netty/redis/proxy/core/client/impl/AbstractPoolClient.java b/nredis-proxy-core/src/main/java/com/opensource/netty/redis/proxy/core/client/impl/AbstractPoolClient.java index 7b869ab..03fa67d 100644 --- a/nredis-proxy-core/src/main/java/com/opensource/netty/redis/proxy/core/client/impl/AbstractPoolClient.java +++ b/nredis-proxy-core/src/main/java/com/opensource/netty/redis/proxy/core/client/impl/AbstractPoolClient.java @@ -5,12 +5,12 @@ package com.opensource.netty.redis.proxy.core.client.impl; import io.netty.channel.ChannelHandlerContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import com.opensource.netty.redis.proxy.commons.exception.RedisException; import com.opensource.netty.redis.proxy.core.client.Client; import com.opensource.netty.redis.proxy.core.command.impl.RedisCommand; import com.opensource.netty.redis.proxy.core.connection.IConnection; +import com.opensource.netty.redis.proxy.core.log.impl.LoggerUtils; import com.opensource.netty.redis.proxy.core.pool.utils.LBRedisProxyChannelPoolUtils; import com.opensource.netty.redis.proxy.pool.LBRedisProxyPoolEntry; import com.opensource.netty.redis.proxy.pool.LBRedisProxyPooledObjectFactory; @@ -25,7 +25,6 @@ public abstract class AbstractPoolClient implements Client{ protected LBRedisProxyBasicPool pool; protected LBRedisProxyPoolConfig ffanRedisProxyPoolConfig; protected LBRedisProxyPooledObjectFactory factory; - private Logger logger = LoggerFactory.getLogger(AbstractPoolClient.class); /** * @@ -40,7 +39,7 @@ public abstract class AbstractPoolClient implements Client{ factory = createChannelFactory(); pool = LBRedisProxyChannelPoolUtils.createPool(ffanRedisProxyPoolConfig, factory); }catch(Exception e){ - logger.error("initPool fail,reason:"+e.getCause()+",message:"+e.getMessage(), e); + LoggerUtils.error("initPool fail,reason:"+e.getCause()+",message:"+e.getMessage(), e); } } @@ -59,7 +58,7 @@ public abstract class AbstractPoolClient implements Client{ } String errorMsg = this.getClass().getSimpleName() + " borrowObject Error"; - logger.error(errorMsg); + LoggerUtils.error(errorMsg); throw new RedisException(errorMsg); } @@ -71,7 +70,7 @@ public abstract class AbstractPoolClient implements Client{ try { pool.returnEntry(entry); } catch (Exception ie) { - logger.error(this.getClass().getSimpleName() + " return client Error" , ie); + LoggerUtils.error(this.getClass().getSimpleName() + " return client Error" , ie); } } diff --git a/pom.xml b/pom.xml index 77fe74e..afddfdf 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ org.slf4j slf4j-api - 1.5.8 + 1.7.2 -- Gitee From c2c66a2f1853356dad26cd78366bbb74c6b5ed2e Mon Sep 17 00:00:00 2001 From: commonrpc <284520459@qq.com> Date: Mon, 16 Jan 2017 22:07:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nredis-proxy-spring/.gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nredis-proxy-spring/.gitignore b/nredis-proxy-spring/.gitignore index b83d222..ba6fa13 100644 --- a/nredis-proxy-spring/.gitignore +++ b/nredis-proxy-spring/.gitignore @@ -1 +1,6 @@ -/target/ +/target/ +*.jar +*.war +*.ear +*.setting +*.project \ No newline at end of file -- Gitee From e7599dcf4175fa57b1307a6c7932dd821e298cbf Mon Sep 17 00:00:00 2001 From: commonrpc <284520459@qq.com> Date: Mon, 16 Jan 2017 22:07:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nredis-proxy-spring/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nredis-proxy-spring/.gitignore b/nredis-proxy-spring/.gitignore index ba6fa13..690730e 100644 --- a/nredis-proxy-spring/.gitignore +++ b/nredis-proxy-spring/.gitignore @@ -3,4 +3,5 @@ *.war *.ear *.setting -*.project \ No newline at end of file +*.project +*.classpath \ No newline at end of file -- Gitee From 66a826df6cff22fa54cb20630eec6c350c08fe38 Mon Sep 17 00:00:00 2001 From: commonrpc <284520459@qq.com> Date: Mon, 16 Jan 2017 22:09:08 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nredis-proxy-spring/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nredis-proxy-spring/.gitignore b/nredis-proxy-spring/.gitignore index 690730e..4d7a306 100644 --- a/nredis-proxy-spring/.gitignore +++ b/nredis-proxy-spring/.gitignore @@ -4,4 +4,5 @@ *.ear *.setting *.project -*.classpath \ No newline at end of file +*.classpath +*.DS_Store \ No newline at end of file -- Gitee From 214d413720900c572fcf54667a91f4971477c413 Mon Sep 17 00:00:00 2001 From: commonrpc <284520459@qq.com> Date: Mon, 16 Jan 2017 22:09:19 +0800 Subject: [PATCH 5/7] geng --- nredis-proxy-spring/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nredis-proxy-spring/.gitignore b/nredis-proxy-spring/.gitignore index 4d7a306..2d90b46 100644 --- a/nredis-proxy-spring/.gitignore +++ b/nredis-proxy-spring/.gitignore @@ -1,4 +1,4 @@ -/target/ + *.jar *.war *.ear -- Gitee From 8a7489aef17be6602fb6c68309e3c716772dd031 Mon Sep 17 00:00:00 2001 From: liubing44 Date: Wed, 25 Jan 2017 23:29:13 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=94=AF=E6=8C=81ping=20=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/constants/RedisConstants.java | 6 ++ nredis-proxy-core/src/.DS_Store | Bin 6148 -> 6148 bytes .../core/protocol/RedisRequestDecoder.java | 54 +++++++++++------- .../proxy/net/client/LBRedisConnection.java | 10 +--- .../server/support/LBRedisServerHandler.java | 22 ++++++- 5 files changed, 62 insertions(+), 30 deletions(-) diff --git a/nredis-proxy-commons/src/main/java/com/opensource/netty/redis/proxy/commons/constants/RedisConstants.java b/nredis-proxy-commons/src/main/java/com/opensource/netty/redis/proxy/commons/constants/RedisConstants.java index 507cc96..e55dbcc 100644 --- a/nredis-proxy-commons/src/main/java/com/opensource/netty/redis/proxy/commons/constants/RedisConstants.java +++ b/nredis-proxy-commons/src/main/java/com/opensource/netty/redis/proxy/commons/constants/RedisConstants.java @@ -45,6 +45,10 @@ public class RedisConstants { public static final String INFO="info"; + public static final String PING="ping"; + + public static final String PONG="pong"; + public static final String ZOOKEEPER_REGISTRY_NAMESPACE = "/nredis-proxy"; @@ -111,6 +115,8 @@ public class RedisConstants { public static final char DOLLAR_BYTE = '$'; public static final char ASTERISK_BYTE = '*'; + + public static final char PING_BYTE = 'P'; public static final char COLON_BYTE = ':'; public static final char OK_BYTE = '+'; public static final char ERROR_BYTE = '-'; diff --git a/nredis-proxy-core/src/.DS_Store b/nredis-proxy-core/src/.DS_Store index f82fe7d786559c4faca97dad18564278e4701480..430f602867a4f8a5133171266d8d730a58cd527e 100644 GIT binary patch delta 351 zcmZoMXfc=|#>B)qu~2NHUhKvX4UCfwL|7*F%hoe6FfjiA4Bn1{L;LX;+SBF zf#I1cB^mJoq5(yzWk9_FiFv7EnZ=n&nK_vyl^mQP7%w1RU2S4&sH0$NTC1Z_ZDC}o zqhMxWQd=v~&cPwAY3k@3Sy0=xXz`Mz%a*S=bOh{W1}R2H2!lZwO2eq58y_BK+04$t f&jAd#jSs&wPv#df6acAi0Ae5w*0?!9WD7F@TQ+2+ delta 108 zcmZoMXfc=|#>CJ*u~2NHUhHH85thmPOtO0a!GHk-SQtteQW=UFN<4G&laq4tlYn9Z xKzs&>H6ZFX2QqJC*_^;!&a|1GgP#Lv98lyt^JIPzLq>+lHayasV? { requestCommand = new RedisCommand(); checkpoint(RequestState.READ_ARGC); } + }else if(ch==RedisConstants.PING_BYTE){//redis-benchmark + buffer.resetReaderIndex(); + requestCommand = new RedisCommand(); + requestCommand.setArgCount(readInt(buffer)); + List args = new ArrayList<>(requestCommand.getArgCount()); + args.add(RedisConstants.PING.getBytes()); + requestCommand.setArgs(args); + + checkpoint(RequestState.READ_ARGC); }else{ throw new Exception("READ_INIT Unexpected character,ch:"+String.valueOf(ch)); } } case READ_ARGC: { - if(requestCommand!=null){ + if(requestCommand!=null&&requestCommand.getArgCount()==0){ requestCommand.setArgCount(readInt(buffer)); - checkpoint(RequestState.READ_ARG); } + checkpoint(RequestState.READ_ARG); } case READ_ARG: { - List args = new ArrayList<>(requestCommand.getArgCount()); - while (args.size() < requestCommand.getArgCount()) { - char ch = (char) buffer.readByte(); - if (ch == '$') { - int length = readInt(buffer); - byte[] argByte = new byte[length]; - buffer.readBytes(argByte); - buffer.skipBytes(2);//skip \r\n - //LoggerUtils.info("String:"+new String(argByte)); - args.add(argByte); - }else{ - throw new Exception("READ_ARG Unexpected character,ch:"+String.valueOf(ch)); - } - } - requestCommand.setArgs(args); + if(requestCommand.getArgs()==null||requestCommand.getArgs().size()==0){ + List args = new ArrayList<>(requestCommand.getArgCount()); + while (args.size() < requestCommand.getArgCount()) { + char ch = (char) buffer.readByte(); + if (ch == '$') { + int length = readInt(buffer); + byte[] argByte = new byte[length]; + buffer.readBytes(argByte); + buffer.skipBytes(2);//skip \r\n + //LoggerUtils.info("String:"+new String(argByte)); + args.add(argByte); + }else{ + throw new Exception("READ_ARG Unexpected character,ch:"+String.valueOf(ch)); + } + } + requestCommand.setArgs(args); + } checkpoint(RequestState.READ_END); } case READ_END: { @@ -102,11 +113,14 @@ public class RedisRequestDecoder extends ReplayingDecoder { ch = (char) buffer.readByte();//\r读取 } buffer.readByte();//\n读取 - try{ - int result= Integer.parseInt(sb.toString()); + int result= 1; + if(!sb.toString().toLowerCase().equals(RedisConstants.PING)){ + result= Integer.parseInt(sb.toString()); + } return result; }catch(Exception e){//网络闭包引起 + throw new Exception("readInt Unexpected character,result:"+sb.toString()+",ch:"+String.valueOf(ch)); } } @@ -114,7 +128,7 @@ public class RedisRequestDecoder extends ReplayingDecoder { private void skipChar(ByteBuf buffer) { for (;;) { char ch = (char) buffer.readByte(); - if (ch == RedisConstants.ASTERISK_BYTE) { + if (ch == RedisConstants.ASTERISK_BYTE||ch==RedisConstants.PING_BYTE) { buffer.readerIndex(buffer.readerIndex() - 1); break; } diff --git a/nredis-proxy-net/src/main/java/com/opensource/netty/redis/proxy/net/client/LBRedisConnection.java b/nredis-proxy-net/src/main/java/com/opensource/netty/redis/proxy/net/client/LBRedisConnection.java index e13b594..cfe2cda 100644 --- a/nredis-proxy-net/src/main/java/com/opensource/netty/redis/proxy/net/client/LBRedisConnection.java +++ b/nredis-proxy-net/src/main/java/com/opensource/netty/redis/proxy/net/client/LBRedisConnection.java @@ -94,13 +94,8 @@ public class LBRedisConnection implements IConnection{ open(); } this.frontCtx=frontCtx; - backChannel.eventLoop().execute(new Runnable() { - - @Override - public void run() { - backChannel.writeAndFlush(request, backChannel.voidPromise()); - } - }); + backChannel.writeAndFlush(request); + } @Override @@ -160,6 +155,7 @@ public class LBRedisConnection implements IConnection{ frontCtx.close(); } state = ChannelState.CLOSE; + } } catch (Exception e) { diff --git a/nredis-proxy-net/src/main/java/com/opensource/netty/redis/proxy/net/server/support/LBRedisServerHandler.java b/nredis-proxy-net/src/main/java/com/opensource/netty/redis/proxy/net/server/support/LBRedisServerHandler.java index 8a6d73d..3625888 100644 --- a/nredis-proxy-net/src/main/java/com/opensource/netty/redis/proxy/net/server/support/LBRedisServerHandler.java +++ b/nredis-proxy-net/src/main/java/com/opensource/netty/redis/proxy/net/server/support/LBRedisServerHandler.java @@ -21,7 +21,10 @@ import com.opensource.netty.redis.proxy.core.config.LBRedisServerMasterCluster; import com.opensource.netty.redis.proxy.core.config.support.LBRedisServerBean; import com.opensource.netty.redis.proxy.core.config.support.LBRedisServerClusterBean; import com.opensource.netty.redis.proxy.core.enums.RedisCommandEnums; +import com.opensource.netty.redis.proxy.core.reply.IRedisReply; import com.opensource.netty.redis.proxy.core.reply.impl.ErrorRedisReply; +import com.opensource.netty.redis.proxy.core.reply.impl.StatusRedisReply; + import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; @@ -58,7 +61,15 @@ public class LBRedisServerHandler extends SimpleChannelInboundHandler1&&!command.equals(RedisConstants.KEYS)){//第一个是命令，第二个是key + if(command.equals("INCR")){ + System.out.println("command:"+command); + } + System.out.println("command:"+command); + if(request!=null&&command.toLowerCase().equals(RedisConstants.PING)){ + IRedisReply redisReply=new StatusRedisReply(); + ((StatusRedisReply) redisReply).setValue(RedisConstants.PONG.getBytes()); + ctx.writeAndFlush(redisReply); + }else if(request!=null&&request.getArgs().size()>1&&!command.equals(RedisConstants.KEYS)){//第一个是命令，第二个是key RedisCommandEnums commandEnums=getRedisCommandEnums(command); @@ -166,13 +177,18 @@ public class LBRedisServerHandler extends SimpleChannelInboundHandler Date: Wed, 25 Jan 2017 23:29:49 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=94=AF=E6=8C=81ping=20=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nredis-proxy-bootstrap/log/nredis-proxy.log | 24 --------------------- 1 file changed, 24 deletions(-) delete mode 100644 nredis-proxy-bootstrap/log/nredis-proxy.log diff --git a/nredis-proxy-bootstrap/log/nredis-proxy.log b/nredis-proxy-bootstrap/log/nredis-proxy.log deleted file mode 100644 index 582ba94..0000000 --- a/nredis-proxy-bootstrap/log/nredis-proxy.log +++ /dev/null @@ -1,24 +0,0 @@ -[VAMS][2017-01-16 22:05:50,139] INFO | Refreshing org.springframework.context.support.ClassPathXmlApplicationContext@928b33a: startup date [Mon Jan 16 22:05:50 CST 2017]; root of context hierarchy | [main] org.springframework.context.support.AbstractApplicationContext.prepareRefresh(510) -[VAMS][2017-01-16 22:05:50,195] INFO | Loading XML bean definitions from URL [file:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-bootstrap/target/classes/redisProxy.xml] | [main] org.springframework.beans.factory.xml.XmlBeanDefinitionReader.loadBeanDefinitions(317) -[VAMS][2017-01-16 22:05:50,519] INFO | Starting ZkClient event thread. | [ZkClient-EventThread-8-127.0.0.1:2181] org.I0Itec.zkclient.ZkEventThread.run(64) -[VAMS][2017-01-16 22:05:51,141] INFO | Client environment:zookeeper.version=3.4.8--1, built on 02/06/2016 03:18 GMT | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,142] INFO | Client environment:host.name=192.168.0.5 | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,142] INFO | Client environment:java.version=1.7.0_71 | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,142] INFO | Client environment:java.vendor=Oracle Corporation | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,143] INFO | Client environment:java.home=/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home/jre | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,143] INFO | Client environment:java.class.path=/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-bootstrap/target/classes:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-spring/target/classes:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-net/target/classes:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-core/target/classes:/Users/liubing/.m2/repository/io/netty/netty-all/4.1.6.Final/netty-all-4.1.6.Final.jar:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-commons/target/classes:/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-pool/target/classes:/Users/liubing/.m2/repository/com/alibaba/fastjson/1.2.4/fastjson-1.2.4.jar:/Users/liubing/.m2/repository/com/101tec/zkclient/0.3/zkclient-0.3.jar:/Users/liubing/.m2/repository/org/apache/zookeeper/zookeeper/3.4.8/zookeeper-3.4.8.jar:/Users/liubing/.m2/repository/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar:/Users/liubing/.m2/repository/jline/jline/0.9.94/jline-0.9.94.jar:/Users/liubing/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar:/Users/liubing/.m2/repository/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar:/Users/liubing/.m2/repository/org/springframework/spring-context/4.1.7.RELEASE/spring-context-4.1.7.RELEASE.jar:/Users/liubing/.m2/repository/org/springframework/spring-aop/4.1.7.RELEASE/spring-aop-4.1.7.RELEASE.jar:/Users/liubing/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:/Users/liubing/.m2/repository/org/springframework/spring-beans/4.1.7.RELEASE/spring-beans-4.1.7.RELEASE.jar:/Users/liubing/.m2/repository/org/springframework/spring-core/4.1.7.RELEASE/spring-core-4.1.7.RELEASE.jar:/Users/liubing/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:/Users/liubing/.m2/repository/org/springframework/spring-expression/4.1.7.RELEASE/spring-expression-4.1.7.RELEASE.jar | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,144] INFO | Client environment:java.library.path=/Users/liubing/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:. | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,144] INFO | Client environment:java.io.tmpdir=/var/folders/g8/z6zm23pj75g9l7lz3cmrmy0h0000gn/T/ | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,144] INFO | Client environment:java.compiler= | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,144] INFO | Client environment:os.name=Mac OS X | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,145] INFO | Client environment:os.arch=x86_64 | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,145] INFO | Client environment:os.version=10.10.3 | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,145] INFO | Client environment:user.name=liubing | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,146] INFO | Client environment:user.home=/Users/liubing | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,146] INFO | Client environment:user.dir=/Users/liubing/Documents/learnDocument/nredis-proxy/nredis-proxy-bootstrap | [main] org.apache.zookeeper.Environment.logEnv(100) -[VAMS][2017-01-16 22:05:51,147] INFO | Initiating client connection, connectString=127.0.0.1:2181 sessionTimeout=60000 watcher=org.I0Itec.zkclient.ZkClient@68f4055f | [main] org.apache.zookeeper.ZooKeeper.(438) -[VAMS][2017-01-16 22:05:51,165] INFO | Opening socket connection to server 127.0.0.1/127.0.0.1:2181. Will not attempt to authenticate using SASL (unknown error) | [main-SendThread(127.0.0.1:2181)] org.apache.zookeeper.ClientCnxn$SendThread.logStartConnect(1032) -[VAMS][2017-01-16 22:05:51,171] INFO | Socket connection established to 127.0.0.1/127.0.0.1:2181, initiating session | [main-SendThread(127.0.0.1:2181)] org.apache.zookeeper.ClientCnxn$SendThread.primeConnection(876) -[VAMS][2017-01-16 22:05:51,188] INFO | Session establishment complete on server 127.0.0.1/127.0.0.1:2181, sessionid = 0x1598c67bdbe0145, negotiated timeout = 40000 | [main-SendThread(127.0.0.1:2181)] org.apache.zookeeper.ClientCnxn$SendThread.onConnected(1299) -[VAMS][2017-01-16 22:05:51,190] INFO | zookeeper state changed (SyncConnected) | [main-EventThread] org.I0Itec.zkclient.ZkClient.processStateChanged(449) -[VAMS][2017-01-16 22:05:51,754] INFO | RedisProxy_Server 已经启动 | [main] com.opensource.netty.redis.proxy.net.server.LBRedisServer.start(148) -- Gitee