X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fcodemux.py;h=25b866f5946f48bbc5b231f2da7f9d7fa8638cef;hb=a4c294316df5642055aed39b0f54b61bee1c30e3;hp=b367b582342f80c27890305ea770ce2941f98d5d;hpb=6cc33eb69e9e8f15b8dce3f69ae43975b57f80fd;p=nodemanager.git diff --git a/plugins/codemux.py b/plugins/codemux.py index b367b58..25b866f 100644 --- a/plugins/codemux.py +++ b/plugins/codemux.py @@ -14,7 +14,7 @@ CODEMUXCONF="/etc/codemux/codemux.conf" def start(options, conf): logger.log("codemux plugin starting up...") -def GetSlivers(plc, data, config): +def GetSlivers(data, config, plc = None): """ For each sliver with the codemux attribute, parse out "host,port" and make entry in conf. Restart service after. @@ -40,8 +40,11 @@ def GetSlivers(plc, data, config): for attribute in sliver['attributes']: if attribute['tagname'] == 'codemux': # add to conf. Attribute is [host, port] - params = {'host': attribute['value'].split(",")[0], - 'port': attribute['value'].split(",")[1]} + parts = attribute['value'].split(",") + if len(parts)<2: + logger.log("codemux: attribute value (%s) for codemux not separated by comma. Skipping."%attribute['value']) + continue + params = {'host': parts[0], 'port': parts[1]} try: # Check to see if sliver is running. If not, continue if vserver.VServer(sliver['name']).is_running(): @@ -149,9 +152,11 @@ def startService(): if not isRunning(): logger.log("codemux: Starting codemux service") logger.log_call("/etc/init.d/codemux", "start") + logger.log_call("/sbin/chkconfig", "codemux", "on") def stopService(): if isRunning(): logger.log("codemux: Stopping codemux service") logger.log_call("/etc/init.d/codemux", "stop") + logger.log_call("/sbin/chkconfig", "codemux", "off")