diff src/main/java/christie/topology/node/IncomingConnectionInfo.java @ 68:37601b98f0da

update TopologyNode
author akahori
date Sat, 01 Sep 2018 08:10:15 +0900
parents 4e2453333508
children c1626d2b4bb4
line wrap: on
line diff
--- a/src/main/java/christie/topology/node/IncomingConnectionInfo.java	Fri Aug 31 08:55:27 2018 +0900
+++ b/src/main/java/christie/topology/node/IncomingConnectionInfo.java	Sat Sep 01 08:10:15 2018 +0900
@@ -10,53 +10,31 @@
 
 public class IncomingConnectionInfo extends CodeGear {
     @Peek
-    TopologyNodeConfig topologyNodeConfig;
-
-    @Peek
     String nodeName;
 
     @Take
     HostMessage remoteNodeInfo;
 
-    @Take
-    int count;
-
     private Logger log = Logger.getLogger(IncomingConnectionInfo.class);
 
 
     public IncomingConnectionInfo() {
     }
 
-
-
     @Override
     protected void run(CodeGearManager cgm) {
-        String managerKey = topologyNodeConfig.getManagerKey();
         log.info(remoteNodeInfo.toString());
-        if ( remoteNodeInfo.hostName.equals("")) { // end case
-            log.info(" topology node finished " + nodeName);
-            getLocalDGM().put("configNodeNum", 0);
-            return ;
-        }
+        //if ( remoteNodeInfo.hostName.equals("")) { // end case
+            //return ;
+        //}
         log.info("topology node " + nodeName + " will connect to " + remoteNodeInfo.hostName );
-        if (cgm.getDgmList().contains(remoteNodeInfo.connectionName)) {
-            // need to wait remove by DeleteConnection
-            getDGM("manager").put(nodeName, remoteNodeInfo);
-        } else {
-            cgm.createRemoteDGM(remoteNodeInfo.connectionName, remoteNodeInfo.hostName, remoteNodeInfo.port);
+
+        cgm.createRemoteDGM(remoteNodeInfo.connectionName, remoteNodeInfo.hostName, remoteNodeInfo.port);
+        getDGM(remoteNodeInfo.connectionName).put("reverseNodeName", nodeName);
 
-            getDGM(remoteNodeInfo.connectionName).put("reverseKey", remoteNodeInfo.reverseName);
-            getDGM(remoteNodeInfo.connectionName).put("reverseHostName", remoteNodeInfo.hostName);
-            getDGM(remoteNodeInfo.connectionName).put("reverseKeyPort", remoteNodeInfo.port);
-
-            count++;
-
-            getLocalDGM().put("cMember", remoteNodeInfo.connectionName);
-            cgm.setup(new CreateConnectionList());
-
-        }
+        getLocalDGM().put("cMember", remoteNodeInfo.connectionName);
+        cgm.setup(new CreateConnectionList());
         cgm.setup(new IncomingConnectionInfo());
-        getLocalDGM().put("count", count);
     }
 
 }