X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=codemux.py;h=7b113504e43020a6408733c900f5a4f44e0d339c;hb=bdf20298cd1cd206cf8899f291f8a2d32f50bca4;hp=1d907f7e14dc5c5ea0ae5b0a9bd5f874d93b64aa;hpb=a185ca88c75c3c2e2d793a25988b1e5fd359ad1b;p=nodemanager.git diff --git a/codemux.py b/codemux.py index 1d907f7..7b11350 100644 --- a/codemux.py +++ b/codemux.py @@ -51,8 +51,6 @@ def GetSlivers(data): except: logger.log("codemux: sliver %s not running yet. Deferring."\ % sliver['name']) - - logger.log_exc(name = "codemux") pass # Remove slices from conf that no longer have the attribute @@ -68,7 +66,11 @@ def writeConf(slivers, conf = CODEMUXCONF): '''Write conf with default entry up top. Elements in [] should have lower order domain names first. Restart service.''' f = open(conf, "w") # This needs to be the first entry... - f.write("* root 1080 %s\n" % Config().PLC_PLANETFLOW_HOST) + try: + f.write("* root 1080 %s\n" % Config().PLC_PLANETFLOW_HOST) + except AttributeError: + logger.log("codemux: Can't find PLC_CONFIG_HOST in config. Using PLC_API_HOST") + f.write("* root 1080 %s\n" % Config().PLC_API_HOST) # Sort items for like domains for mapping in slivers: for (host, params) in mapping.iteritems():