diff src/main/java/christie/topology/manager/TopologyManager.java @ 74:e2ce8038815a

fix FileParser
author akahori
date Wed, 05 Sep 2018 09:43:22 +0900
parents f1f34c3e33d4
children 2314c55534ef
line wrap: on
line diff
--- a/src/main/java/christie/topology/manager/TopologyManager.java	Wed Sep 05 09:04:06 2018 +0900
+++ b/src/main/java/christie/topology/manager/TopologyManager.java	Wed Sep 05 09:43:22 2018 +0900
@@ -4,10 +4,6 @@
 import christie.codegear.CodeGear;
 import christie.codegear.CodeGearManager;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 
@@ -15,6 +11,9 @@
 
 public class TopologyManager extends CodeGear {
 
+    @Peek
+    TopologyManagerConfig topologyManagerConfig;
+
     public TopologyManager() {
     }
 
@@ -23,14 +22,16 @@
         cgm.setup(new CheckComingHost());
         getLocalDGM().put("absCookieTable", new HashMap<String, String>());
 
-        cgm.setup(new FileParser());
-        cgm.setup(new IncomingHosts());
-        cgm.setup(new ConfigWaiter());
+        if(!topologyManagerConfig.dynamic) {
+            cgm.setup(new FileParser());
+            cgm.setup(new IncomingHosts());
+            cgm.setup(new ConfigWaiter());
+            getLocalDGM().put("running", false);
+        }
+
         cgm.setup(new CreateHash());
         cgm.setup(new TopologyFinish());
 
-        getLocalDGM().put("running", false);
-        getLocalDGM().put("hostInfoMap", new HashMap<String, HostMessage>());
         getLocalDGM().put("topology", new HashMap<String, HashMap<String, HostMessage>>());
         getLocalDGM().put("createdList", new LinkedList<String>());