Mercurial > hg > Database > Alice

changeset 486:7be9054f7465 dispose

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactor. keepAlive has bug. if clear TaskType close , need to delete ResponsePing CodeSegment
author sugi
date Sun, 07 Dec 2014 18:30:09 +0900
parents 45b3fe2375ef
children c1cf44777eef
files src/main/java/alice/daemon/Config.java src/main/java/alice/topology/manager/StartTopologyManager.java src/main/java/alice/topology/manager/TopologyManagerConfig.java src/main/java/alice/topology/node/TopologyNodeConfig.java
diffstat 4 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/alice/daemon/Config.java	Sat Dec 06 21:10:02 2014 +0900
+++ b/src/main/java/alice/daemon/Config.java	Sun Dec 07 18:30:09 2014 +0900
@@ -6,7 +6,7 @@
 
     public int localPort = 10000;
     public String logFile = null;
-    public Level level = null;
+    public Level level = Level.FATAL;
     public String MCSTADDR = "224.0.0.1";
     public String nis = "en1";
 
--- a/src/main/java/alice/topology/manager/StartTopologyManager.java	Sat Dec 06 21:10:02 2014 +0900
+++ b/src/main/java/alice/topology/manager/StartTopologyManager.java	Sun Dec 07 18:30:09 2014 +0900
@@ -33,7 +33,7 @@
         new CheckComingHost();
         ods.put("absCookieTable", new HashMap<String, String>());
 
-        if (!conf.extendTopology) {
+        if (!conf.dynamic) {
             LinkedList<String> nodeNames = new LinkedList<String>();
             HashMap<String, LinkedList<NodeInfo>> topology = new HashMap<String, LinkedList<NodeInfo>>();
             int nodeNum = 0;
--- a/src/main/java/alice/topology/manager/TopologyManagerConfig.java	Sat Dec 06 21:10:02 2014 +0900
+++ b/src/main/java/alice/topology/manager/TopologyManagerConfig.java	Sun Dec 07 18:30:09 2014 +0900
@@ -5,17 +5,18 @@
 public class TopologyManagerConfig extends Config {
 
     public String confFilePath;
-    public boolean extendTopology = false;
+    public boolean dynamic = false;
 
     public TopologyManagerConfig(String[] args) {
         super(args);
         for (int i = 0; i < args.length; i++) {
             if ("-conf".equals(args[i])) {
                 confFilePath = args[++i];
-            } else if ("-t".equals(args[i])) {
-                extendTopology = true;
             }
         }
+
+        if (confFilePath == null)
+            dynamic = true;
     }
 
 }
--- a/src/main/java/alice/topology/node/TopologyNodeConfig.java	Sat Dec 06 21:10:02 2014 +0900
+++ b/src/main/java/alice/topology/node/TopologyNodeConfig.java	Sun Dec 07 18:30:09 2014 +0900
@@ -5,7 +5,7 @@
 public class TopologyNodeConfig extends Config {
 
     private String managerHostName;
-    private int managerPort;
+    private int managerPort = 10000;
     public String cookie;
 
     public TopologyNodeConfig(String[] args) {