Mercurial > hg > Database > Christie

changeset 65:5deea416f980

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix variable name
author akahori
date Thu, 30 Aug 2018 10:56:37 +0900
parents f884c1bd0d36
children 4e2453333508
files src/main/java/christie/topology/node/IncomingAbstractHostName.java src/main/java/christie/topology/node/IncomingConnectionInfo.java
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/christie/topology/node/IncomingAbstractHostName.java	Thu Aug 30 10:55:37 2018 +0900
+++ b/src/main/java/christie/topology/node/IncomingAbstractHostName.java	Thu Aug 30 10:56:37 2018 +0900
@@ -9,7 +9,7 @@
 
     private final TopologyNodeConfig conf;
     @Peek
-    String host;
+    String nodeName;
 
     public IncomingAbstractHostName(TopologyNodeConfig conf) {
         this.conf = conf;
@@ -17,7 +17,7 @@
 
     @Override
     protected void run(CodeGearManager cgm) {
-        cgm.setup(new IncomingConnectionInfo(host, 0, conf.getManagerKey()));
+        cgm.setup(new IncomingConnectionInfo(nodeName, 0, conf.getManagerKey()));
     }
 
 }
--- a/src/main/java/christie/topology/node/IncomingConnectionInfo.java	Thu Aug 30 10:55:37 2018 +0900
+++ b/src/main/java/christie/topology/node/IncomingConnectionInfo.java	Thu Aug 30 10:56:37 2018 +0900
@@ -1,7 +1,7 @@
 package christie.topology.node;
 
 
-import christie.annotation.TakeFrom;
+import christie.annotation.Take;
 import christie.codegear.CodeGear;
 import christie.codegear.CodeGearManager;
 import christie.topology.HostMessage;
@@ -9,8 +9,8 @@
 
 public class IncomingConnectionInfo extends CodeGear {
 
-    @TakeFrom("manager")
-    HostMessage hostInfo;
+    @Take
+    HostMessage remoteNodeInfo;
 
     private String absName;
     private int count;
@@ -21,7 +21,7 @@
         this.absName = absName;
         this.count = count;
         this.managerKey = managerKey;
-        //hostInfo.setKey(managerKey,absName);
+        //remoteNodeInfo.setKey(managerKey,absName);
     }
 
 
@@ -29,26 +29,26 @@
     @Override
     protected void run(CodeGearManager cgm) {
 
-        log.info(hostInfo.toString());
-        if ( hostInfo.hostName.equals("")) { // end case
+        log.info(remoteNodeInfo.toString());
+        if ( remoteNodeInfo.hostName.equals("")) { // end case
             log.info(" topology node finished " + absName);
             getLocalDGM().put("configNodeNum", 0);
             return ;
         }
-        log.info("topology node " + absName + " will connect to " + hostInfo.hostName );
-        if (cgm.getDgmList().contains(hostInfo.connectionName)) {
+        log.info("topology node " + absName + " will connect to " + remoteNodeInfo.hostName );
+        if (cgm.getDgmList().contains(remoteNodeInfo.connectionName)) {
             // need to wait remove by DeleteConnection
-            getDGM("manager").put(absName, hostInfo);
+            getDGM("manager").put(absName, remoteNodeInfo);
         } else {
-            cgm.createRemoteDGM(hostInfo.connectionName, hostInfo.hostName, hostInfo.port);
+            cgm.createRemoteDGM(remoteNodeInfo.connectionName, remoteNodeInfo.hostName, remoteNodeInfo.port);
 
-            getDGM(hostInfo.connectionName).put("reverseKey", hostInfo.reverseName);
-            getDGM(hostInfo.connectionName).put("reverseHostName", hostInfo.hostName);
-            getDGM(hostInfo.connectionName).put("reverseKeyPort", hostInfo.port);
+            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", hostInfo.connectionName);
+            getLocalDGM().put("cMember", remoteNodeInfo.connectionName);
             cgm.setup(new CreateConnectionList());
 
         }