git://git.onelab.eu
/
mom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tagging module Mom - Mom-2.2-7
[mom.git]
/
pl_mom.py
diff --git
a/pl_mom.py
b/pl_mom.py
index
51cb34e
..
bcb77c4
100644
(file)
--- a/
pl_mom.py
+++ b/
pl_mom.py
@@
-5,7
+5,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# 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
#
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"
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):
"""
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):
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))
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
"""
Simple interface to local Node Manager API
"""
- def __init__(self, url = "http://localhost:812/", timeout =
1
0):
+ def __init__(self, url = "http://localhost:812/", timeout =
3
0):
"""
Open a new connection to the local Node Manager
"""
"""
Open a new connection to the local Node Manager
"""
-
socket.setdefaulttimeout(timeout)
try:
self.nm = xmlrpclib.ServerProxy(url)
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:
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()
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
(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
return values