X-Git-Url: http://git.onelab.eu/?p=mom.git;a=blobdiff_plain;f=pl_mom.py;h=bcb77c44eae55a91ce54c416fa708ad47d9f2cd1;hp=51cb34e28fbd8b416c5269c1fc7d70c75de07af7;hb=1b22b4327b132b42f51effb7b8b6b73a881a83f6;hpb=cc74f4314f465de81a5e9a0bc6b31bb19b13346a diff --git a/pl_mom.py b/pl_mom.py index 51cb34e..bcb77c4 100644 --- a/pl_mom.py +++ b/pl_mom.py @@ -5,7 +5,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: pl_mom.py,v 1.3 2006/05/09 03:22:25 mlhuang Exp $ +# $Id$ # import os @@ -23,8 +23,8 @@ except: print "Warning: Configuration file /etc/planetlab/plc_config.py not found" PLC_NAME = "PlanetLab" PLC_SLICE_PREFIX = "pl" - PLC_MAIL_SUPPORT_ADDRESS = "support@planet-lab.org" - PLC_MAIL_SLICE_ADDRESS = "SLICE@slices.planet-lab.org" + PLC_MAIL_SUPPORT_ADDRESS = "root@" + socket.gethostname() + PLC_MAIL_SLICE_ADDRESS = "SLICE@" + socket.gethostname() def format_bytes(bytes, si = True): """ @@ -86,13 +86,9 @@ def removepid(prog): os.unlink("/var/run/%s.pid" % prog) def slicemail(slice, subject, body): - sendmail = os.popen("/usr/sbin/sendmail -t -f%s" % PLC_MAIL_SUPPORT_ADDRESS, "w") + sendmail = os.popen("/usr/sbin/sendmail -N never -t -f%s" % PLC_MAIL_SUPPORT_ADDRESS, "w") - # PLC has a separate list for pl_mom messages - if PLC_MAIL_SUPPORT_ADDRESS == "support@planet-lab.org": - to = ["pl-mom@planet-lab.org"] - else: - to = [PLC_MAIL_SUPPORT_ADDRESS] + to = [PLC_MAIL_MOM_LIST_ADDRESS] if slice is not None and slice != "root": to.append(PLC_MAIL_SLICE_ADDRESS.replace("SLICE", slice)) @@ -167,11 +163,10 @@ class NM: Simple interface to local Node Manager API """ - def __init__(self, url = "http://localhost:812/", timeout = 10): + def __init__(self, url = "http://localhost:812/", timeout = 30): """ Open a new connection to the local Node Manager """ - socket.setdefaulttimeout(timeout) try: self.nm = xmlrpclib.ServerProxy(url) @@ -190,8 +185,7 @@ class NM: values = [attribute[1] for attribute in attributes] if self.nm is not None: - try: - # Read rspec (the NM hash code for the slice) + # Read rspec (the NM hash code for the slice) rcap = open("/var/run/pl_nm/%s.vm_rcap" % slice, "r") rspec = rcap.readline().strip() rcap.close() @@ -199,7 +193,4 @@ class NM: (rc, result) = self.nm.nm_inspect(rspec, attributes) if rc == 0 and type(result) == list and len(result) == len(values): values = result - except Exception, err: - print "Warning: Exception received while querying Node Manager:", err - return values