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
Must use vkill to kill outside of root.
[mom.git]
/
pl_mom.py
diff --git
a/pl_mom.py
b/pl_mom.py
index
0c05740
..
f058eb4
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.4 2006/06/02 04:00:00 mlhuang Exp
$
+# $Id$
#
import os
#
import os
@@
-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))