From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Mon, 24 Mar 2008 21:41:20 +0000 (+0000)
Subject: add carriage return to lines
X-Git-Tag: 1.7-3~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cb4c6593e171129dd518620a8d09fd3f3379b168;p=nodemanager.git

add carriage return to lines
---

diff --git a/codemux.py b/codemux.py
index 851fd24..62e9fe5 100644
--- a/codemux.py
+++ b/codemux.py
@@ -27,7 +27,7 @@ def GetSlivers(data):
         for attribute in sliver['attributes']:
             if attribute['name'] == 'codemux':
                 # add to conf.  Attribute is [host, port]
-                [host, port] = attribute['value'].split()
+                [host, port] = attribute['value'].split(",")
                 try:
                     # Check to see if sliver is running.  If not, continue
                     if vserver.VServer(sliver['name']).is_running():
@@ -62,9 +62,9 @@ def GetSlivers(data):
 def writeConf(slivers, conf = CODEMUXCONF):
     '''Write conf with default entry up top. Restart service.'''
     f = open(conf, "w")
-    f.write("* root 1080")
-    for (host, slice, port) in slivers.iteritems():
-        f.write("%s %s %s" % [host, slice, port])
+    f.write("* root 1080\n")
+    for (slice, params) in slivers.iteritems():
+        f.write("%s %s %s\n" % (params['host'], slice, params['port']))
     f.truncate()
     f.close()
     logger.log("codemux: restarting codemux service")