使用新的netty client factory

mpusher · Jan 22, 2016 · d4fbefe · d4fbefe
1 parent ff57ca3
commit d4fbefe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/mpush-cs/src/main/java/com/shinemo/mpush/cs/client/Main.java b/mpush-cs/src/main/java/com/shinemo/mpush/cs/client/Main.java
@@ -21,13 +21,9 @@ public static void main(String[] args) throws Exception {
 		int index = (int) ((Math.random() % serverList.size()) * serverList.size());
 		ConnectionServerApplication server = serverList.get(index);
 
-		List<Client> clientList = Lists.newArrayList();
-
 		for(int i = 0;i<100;i++){
 			ClientChannelHandler handler = new ClientChannelHandler();
-
+			NettyClientFactory.INSTANCE.createClient(server.getIp(), server.getPort(), handler, true);
-			final Client client = NettyClientFactory.INSTANCE.get(server.getIp(), server.getPort(), handler, true);
-			clientList.add(client);
 		}
 
 		LockSupport.park();

diff --git a/mpush-netty/src/main/java/com/shinemo/mpush/netty/client/NettyClientFactory.java b/mpush-netty/src/main/java/com/shinemo/mpush/netty/client/NettyClientFactory.java
@@ -26,7 +26,7 @@ public class NettyClientFactory {
 
     private final Map<Channel, Client> channel2Client = Maps.newConcurrentMap();
 
-    public void createClient(String host, int port, final ChannelHandler handler,boolean security) {
+    public Client createClient(String host, int port, final ChannelHandler handler,boolean security) {
         final Bootstrap bootstrap = new Bootstrap();
         EventLoopGroup workerGroup = new NioEventLoopGroup();
         bootstrap.group(workerGroup)//
@@ -59,10 +59,12 @@ public void initChannel(SocketChannel ch) throws Exception {
 				client = new NettyClient(host,port, channel);
 			}
             channel2Client.put(channel, client);
+            return client;
         } else {
             future.cancel(true);
             future.channel().close();
             log.warn("[remoting] failure to connect:" + host+","+port);
+            return null;
         }
     }
 

diff --git a/mpush-ps/src/main/java/com/shinemo/mpush/ps/GatewayClientManage.java b/mpush-ps/src/main/java/com/shinemo/mpush/ps/GatewayClientManage.java
@@ -19,7 +19,7 @@ public class GatewayClientManage extends GatewayServerManage{
 	public void addOrUpdate(String fullPath, GatewayServerApplication application) {
 		super.addOrUpdate(fullPath, application);
 		try{
-			Client client = NettyClientFactory.INSTANCE.get(application.getIp(), application.getPort(), new GatewayClientChannelHandler(), false);
+			Client client = NettyClientFactory.INSTANCE.createClient(application.getIp(), application.getPort(), new GatewayClientChannelHandler(), false);
 			application2Client.put(application, client);
 			ip2Client.put(application.getIp()+":"+application.getPort(), client);
 		}catch(Exception e){