X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fmailer.py;h=d3f5df4b232506eeaf9bca420b35f775dd5f70ac;hb=40588e1f900ba82db3ca69c5cc375805028f2430;hp=142ba04a5d624c4f7a99edddab56d926bbbac703;hpb=6f2351e4b44590221425fa9b4bfa77c92db49b6a;p=monitor.git

diff --git a/monitor/wrapper/mailer.py b/monitor/wrapper/mailer.py
index 142ba04..d3f5df4 100755
--- a/monitor/wrapper/mailer.py
+++ b/monitor/wrapper/mailer.py
@@ -3,6 +3,7 @@
 # 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 *
@@ -218,7 +219,7 @@ def emailViaRT_NoTicket(subject, text, to):
 	input_text  = "Subject: %s\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"
@@ -352,18 +353,7 @@ if __name__=="__main__":
 	#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..."},
-			   [FROM])
-	#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])