From: Scott Baker <smbaker@gmail.com>
Date: Wed, 8 Jan 2014 07:12:03 +0000 (-0800)
Subject: fix codemux restarting every 15 minutes
X-Git-Tag: nodemanager-5.2-10~20
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=9dd5eaa2fa490eaf252adb66589c39c6f79cbc48

fix codemux restarting every 15 minutes
---

diff --git a/plugins/codemux.py b/plugins/codemux.py
index 49ada18..af7fb58 100644
--- a/plugins/codemux.py
+++ b/plugins/codemux.py
@@ -125,14 +125,19 @@ def parseConf(conf = CODEMUXCONF):
     try:
         f = open(conf)
         for line in f.readlines():
-            if line.startswith("#") \
-            or (len(line.split()) > 4) \
-            or (len(line.split()) < 3):
+            parts = line.split()
+            if line.startswith("#") or (len(parts) > 4) or (len(parts) < 3):
                 continue
-            (host, slice, port) = line.split()[:3]
-            logger.log("codemux:  found %s in conf" % slice, 2)
-            slicesinconf.setdefault(slice, [])
-            slicesinconf[slice].append({"host": host, "port": port})
+            if len(parts) == 4:
+                (host, slice, port, ip) = parts
+                logger.log("codemux:  found %s in conf" % slice, 2)
+                slicesinconf.setdefault(slice, [])
+                slicesinconf[slice].append({"host": host, "port": port, "ip": ip})
+            else:
+                (host, slice, port) = parts[:3]
+                logger.log("codemux:  found %s in conf" % slice, 2)
+                slicesinconf.setdefault(slice, [])
+                slicesinconf[slice].append({"host": host, "port": port})
         f.close()
     except IOError: logger.log_exc("codemux.parseConf got IOError")
     return slicesinconf