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-4
[mom.git]
/
pl_mom.py
diff --git
a/pl_mom.py
b/pl_mom.py
index
6d4d8bf
..
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.5 2006/07/10 15:19:35 faiyaza 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):
"""
@@
-88,11
+88,7
@@
def removepid(prog):
def slicemail(slice, subject, body):
sendmail = os.popen("/usr/sbin/sendmail -N never -t -f%s" % PLC_MAIL_SUPPORT_ADDRESS, "w")
def slicemail(slice, subject, body):
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))