Mercurial > hg > Database > Christie

changeset 71:36c5c050394d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update put startCG
author akahori
date Sat, 01 Sep 2018 10:00:19 +0900
parents dcf906f7ff41
children 32f6f9de97c1
files src/main/java/christie/topology/node/ConfigurationFinish.java src/main/java/christie/topology/node/Start.java src/main/java/christie/topology/node/StartTopologyNode.java src/main/java/christie/topology/node/TopologyNode.java
diffstat 4 files changed, 6 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/christie/topology/node/ConfigurationFinish.java	Sat Sep 01 09:58:33 2018 +0900
+++ b/src/main/java/christie/topology/node/ConfigurationFinish.java	Sat Sep 01 10:00:19 2018 +0900
@@ -19,22 +19,16 @@
     @Peek
     TopologyNodeConfig topologyNodeConfig;
 
-    private CodeGear startCG;
-
     public ConfigurationFinish() {
         // System.err.println("config finish ...") ;
     }
 
-    public ConfigurationFinish(CodeGear startCG) {
-        this.startCG = startCG;
-    }
-
     @Override
     protected void run(CodeGearManager cgm) {
         // System.err.println(" rcount = " + Integer.toString(rcount) + " " + Integer.toString(ncount));
         if (reverseCount == connectNodeNum) {
             getDGM(topologyNodeConfig.getManagerKey()).put("nodePrepareDone", "done");
-            cgm.setup(new Start(startCG));
+            cgm.setup(new Start());
 
 
             /*if (topologyNodeConfig.useKeepAlive)
@@ -45,6 +39,6 @@
             return;
         }
 
-        cgm.setup(new ConfigurationFinish(this.startCG));
+        cgm.setup(new ConfigurationFinish());
     }
 }
--- a/src/main/java/christie/topology/node/Start.java	Sat Sep 01 09:58:33 2018 +0900
+++ b/src/main/java/christie/topology/node/Start.java	Sat Sep 01 10:00:19 2018 +0900
@@ -15,17 +15,13 @@
 
     private Logger logger = Logger.getLogger(Start.class);
 
-    //@Take
+    @Take
     CodeGear startCG;
 
 
     public Start() {
     }
 
-    public Start(CodeGear startCG) {
-        this.startCG = startCG;
-    }
-
     @Override
     protected void run(CodeGearManager cgm) {
         logger.info("Configuration finished.");
--- a/src/main/java/christie/topology/node/StartTopologyNode.java	Sat Sep 01 09:58:33 2018 +0900
+++ b/src/main/java/christie/topology/node/StartTopologyNode.java	Sat Sep 01 10:00:19 2018 +0900
@@ -5,13 +5,11 @@
 import christie.codegear.StartCodeGear;
 
 public class StartTopologyNode extends StartCodeGear{
-    TopologyNodeConfig conf;
-    CodeGear startCG;
 
     public StartTopologyNode(CodeGearManager cgm, TopologyNodeConfig conf, CodeGear startCG) {
         super(cgm);
-        cgm.setup(new TopologyNode(startCG));
-        //cgm.getLocalDGM().put("startCG", startCG);
+        cgm.setup(new TopologyNode());
+        cgm.getLocalDGM().put("startCG", startCG);
         cgm.getLocalDGM().put("topologyNodeConfig", conf);
 
     }
--- a/src/main/java/christie/topology/node/TopologyNode.java	Sat Sep 01 09:58:33 2018 +0900
+++ b/src/main/java/christie/topology/node/TopologyNode.java	Sat Sep 01 10:00:19 2018 +0900
@@ -15,15 +15,9 @@
     @Peek
     TopologyNodeConfig topologyNodeConfig;
 
-    private CodeGear startCG;
     public TopologyNode() {
     }
 
-
-    public TopologyNode(CodeGear startCG) {
-        this.startCG = startCG;
-    }
-
     @Override
     protected void run(CodeGearManager cgm) {
 
@@ -52,7 +46,7 @@
         cgm.setup(new SaveCookie());
         cgm.setup(new IncomingConnectionInfo());
         cgm.setup(new IncomingReverseKey());
-        cgm.setup(new ConfigurationFinish(this.startCG));
+        cgm.setup(new ConfigurationFinish());
 
     }
 }