# Copyright (c) 2004 The Trustees of Princeton University (Trustees).
#
# Faiyaz Ahmed <faiyaza@cs.princeton.edu>
+# Stephen Soltesz <soltesz@cs.princeton.edu>
#
# $Id: mailer.py,v 1.10 2007/08/08 13:28:06 soltesz Exp $
from emailTxt import *
logger = logging.getLogger("monitor")
MTA="localhost"
-FROM="monitor@planet-lab.org"
+FROM=config.email
def reformat_for_rt(text):
lines = text.split("\n")
# NOTE: AdminCc: (in PLC's RT configuration) gets an email sent.
# This is not the case (surprisingly) for Cc:
input_text = "Subject: %s\n"
- input_text += "Requestor: monitor@planet-lab.org\n"
+ input_text += "Requestor: %s\n"% FROM
input_text += "id: ticket/new\n"
- input_text += "Queue: Monitor\n"
+ input_text += "Queue: %s\n" % config.RT_QUEUE
for recipient in to:
input_text += "AdminCc: %s\n" % recipient
input_text += "Text: %s"
if config.bcc and not config.debug:
writer.addheader("Bcc", config.email)
- writer.addheader("Reply-To", 'monitor@planet-lab.org')
+ writer.addheader("Reply-To", FROM)
writer.addheader("MIME-Version", "1.0")
#
#email("[spam] bcc test from golf.cs.princeton.edu",
# "It gets to both recipients",
# "soltesz@cs.utk.edu")
- #emailViaRT("rt via golf",
- # "It gets to both recipients",
- # "soltesz@cs.utk.edu")
- email("Re: [PL #21323] TEST 7",
- mailtxt.newbootcd_one[1] % {'hostname_list':"hostname list..."},
- ['monitor@planet-lab.org'])
- #print "ticketid: %d" % id
- #id = plc.siteId(["alice.cs.princeton.edu"])
- #print id
- #if id:
- #email('TEST', emailTxt.mailtxt.ssh % {'hostname': "ALICE.cs.princeton.edu"}, "tech-" + id + "@sites.planet-lab.org")
- #else:
- # print "No dice."
- #email("TEST111", "I'd like to see if this works anywhere", ["soltesz@cs.princeton.edu", "soltesz@cs.utk.edu"])
- #print "mailer does nothing in main()"
+ emailViaRT("mail via RT", "Let's see if this succeeds...", [FROM])
+ #email("Re: [PL #21323] TEST 7",
+ # mailtxt.newbootcd_one[1] % {'hostname_list':"hostname list..."},
+ # [FROM])