清理代码

hugoDD · Jun 12, 2018 · bb45c88 · bb45c88
1 parent ab39d77
commit bb45c88
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 15 deletions.
diff --git a/rains-redisproxy-net/src/main/java/com/rains/proxy/net/ServerConfiguration.java b/rains-redisproxy-net/src/main/java/com/rains/proxy/net/ServerConfiguration.java
@@ -104,17 +104,22 @@ public RedisServerMasterCluster redisServerMasterCluster(RedisProxyConfiguration
             redisServerClusterBean.setRedisServerMasterBean(redisServerBean);
             redisServerClusterBean.setLoadClusterBalance(loadSlaveBalance);
 
-            //slave
-            List<RedisServerBean> slaves = new ArrayList<>();
-            for(RedisProxySlave slave :master.getRedisSlaves()){
-                RedisServerBean redisSlaveServerBean = new RedisServerBean();
-                redisSlaveServerBean.setRedisPoolConfig(poolConfig);
-                redisSlaveServerBean.setHost(slave.getHost());
-                redisSlaveServerBean.setPort(slave.getPort());
-                slaves.add(redisSlaveServerBean);
+
+            if(redisServerClusterBean.getRedisServerSlaveBeans()!=null){
+                //slave
+                List<RedisServerBean> slaves = new ArrayList<>();
+                for(RedisProxySlave slave :master.getRedisSlaves()){
+                    RedisServerBean redisSlaveServerBean = new RedisServerBean();
+                    redisSlaveServerBean.setRedisPoolConfig(poolConfig);
+                    redisSlaveServerBean.setHost(slave.getHost());
+                    redisSlaveServerBean.setPort(slave.getPort());
+                    slaves.add(redisSlaveServerBean);
+                }
+                redisServerClusterBean.setRedisServerSlaveBeans(slaves);
             }
-            redisServerClusterBean.setRedisServerSlaveBeans(slaves);
+
             list.add(redisServerClusterBean);
+
         }
 
 

diff --git a/rains-redisproxy-net/src/main/java/com/rains/proxy/net/client/RedisProxyClient.java b/rains-redisproxy-net/src/main/java/com/rains/proxy/net/client/RedisProxyClient.java
@@ -73,7 +73,7 @@ public synchronized void close() {
 	 */
 	@Override
 	protected PooledFactory<IConnection> createChannelFactory() {
-		return new RedisConnectionFactory(redisProxyPoolConfig.getHost(),redisProxyPoolConfig.getPort(),redisProxyPoolConfig.getConnectionTimeout());
+		return new RedisConnectionFactory(redisHost,port,redisProxyPoolConfig.getConnectionTimeout());
 	}
 
 	@Override

diff --git a/rains-redisproxy-net/src/main/java/com/rains/proxy/net/service/InitService.java b/rains-redisproxy-net/src/main/java/com/rains/proxy/net/service/InitService.java
@@ -0,0 +1,20 @@
+package com.rains.proxy.net.service;
+
+/**
+ * Created by yuliang on 2017/4/12.
+ */
+
+public interface InitService {
+
+
+    /**
+     * 服务启动
+     */
+    void start();
+
+    /**
+     * 服务关闭
+     */
+    void close();
+
+}
diff --git a/rains-redisproxy-net/src/main/java/com/rains/proxy/net/service/impl/InitServiceImpl.java b/rains-redisproxy-net/src/main/java/com/rains/proxy/net/service/impl/InitServiceImpl.java
@@ -0,0 +1,59 @@
+package com.rains.proxy.net.service.impl;
+
+import com.rains.proxy.core.bean.RedisServerMasterCluster;
+import com.rains.proxy.net.model.Server;
+import com.rains.proxy.net.server.RedisProxyServer;
+import com.rains.proxy.net.service.InitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+/**
+ * create by lorne on 2017/9/20
+ */
+@Service
+@Lazy(false)
+public class InitServiceImpl implements InitService {
+
+    @Autowired
+    private RedisServerMasterCluster redisServerMasterCluster;
+
+//    @Autowired
+//    private NettyServerService nettyServerService;
+
+   private RedisProxyServer ffanRedisServer;
+
+    @Autowired
+    private Server serverConfig;
+
+    @PostConstruct
+    public void init(){
+        start();
+    }
+
+    @PreDestroy
+    public void destroy(){
+        close();
+    }
+
+
+    @Override
+    public void start() {
+//        nettyServerService.start();
+//        SocketManager.getInstance().setMaxConnection(serverConfig.getMaxCount());
+
+         ffanRedisServer=new RedisProxyServer(redisServerMasterCluster);
+
+        ffanRedisServer.start();
+    }
+
+
+    @Override
+    public void close() {
+        ffanRedisServer.destroy();
+       // nettyServerService.close();
+    }
+}
diff --git a/rains-redisproxy-sample/server-demo/src/main/resources/application.yml b/rains-redisproxy-sample/server-demo/src/main/resources/application.yml
@@ -41,11 +41,11 @@ redisproxy:
     - redisMasters :
        -  host: 172.26.223.109
           port: 16379
-          redisSlaves:
-            - host: 172.26.223.109
-              port: 26379
-            - host: 172.26.223.109
-              port: 6379
+#          redisSlaves:
+#            - host: 172.26.223.109
+#              port: 26379
+#            - host: 172.26.223.109
+#              port: 6379
 #       -  host: 172.26.223.108
 #          port: 16379
 #          redisSlaves: