From 9dd5eaa2fa490eaf252adb66589c39c6f79cbc48 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Tue, 7 Jan 2014 23:12:03 -0800 Subject: [PATCH] fix codemux restarting every 15 minutes --- plugins/codemux.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) 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 -- 2.43.0