X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fmailer.py;h=afa72eb24fe8f4736ef688137e69509cf883f6ea;hb=HEAD;hp=abf035229556eff9fa2151b8229f989d11be005c;hpb=4bf13ed6dd1e71c3f065b7a1957cd3d76c121217;p=monitor.git

diff --git a/monitor/wrapper/mailer.py b/monitor/wrapper/mailer.py
index abf0352..afa72eb 100755
--- a/monitor/wrapper/mailer.py
+++ b/monitor/wrapper/mailer.py
@@ -65,8 +65,12 @@ def getTicketStatus(ticket_id):
 		r_values[key] = ":".join(vals[1:])
 		r_values[key] = r_values[key].strip()
 
-	r_values['Created'] = calendar.timegm(time.strptime(r_values['Created']))
-	r_values['Told'] = calendar.timegm(time.strptime(r_values['Told']))
+	#if 'Created' in r_values:
+	#	r_values['Created'] = calendar.timegm(time.strptime(r_values['Created']))
+	#else:
+	r_values['Created'] = calendar.timegm(time.localtime())
+		
+	#r_values['Told'] = calendar.timegm(time.strptime(r_values['Told']))
 	return r_values
 
 def setAdminCCViaRT(ticket_id, to):
@@ -80,7 +84,7 @@ def setAdminCCViaRT(ticket_id, to):
 
 	# create a comma-separated list
 	s_to = ",".join(to)
-	cmd = "rt edit ticket/%s set admincc='%s'" % (ticket_id, s_to)
+	cmd = "rt edit ticket/%s set cc='%s'" % (ticket_id, s_to)
 	print cmd
 	(f_in, f_out, f_err) = os.popen3(cmd)
 	value = f_out.read()
@@ -91,7 +95,7 @@ def setAdminCCViaRT(ticket_id, to):
 		pass
 	else:
 		print "VALUE:", value
-		print "ERROR: RT failed to update AdminCC for ticket %s" % ticket_id
+		print "ERROR: RT failed to update CC for ticket %s" % ticket_id
 
 	return
 
@@ -225,15 +229,15 @@ def emailViaRT_NoTicket(subject, text, to):
 	# Set ENV Variables/PATH
 	_setupRTenvironment()
 
-	# NOTE: AdminCc: (in PLC's RT configuration) gets an email sent.
+	# NOTE: Cc: (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: %s\n"% FROM
 	input_text += "id: ticket/new\n"
 	input_text += "Queue: %s\n" % config.RT_QUEUE
 	for recipient in to:
-		input_text += "AdminCc: %s\n" % recipient
-	#input_text += "AdminCc: %s\n" % config.cc_email
+		input_text += "Cc: %s\n" % recipient
+	#input_text += "Cc: %s\n" % config.cc_email
 	input_text += "Text: %s"
 
 	# Add a space for each new line to get RT to accept the file.
@@ -339,12 +343,7 @@ def email(subject, text, to):
 		for mta in [MTA, 'golf.cs.princeton.edu']:
 			try:
 				# This is normal operation
-				#print MTA
-				#print FROM
-				#print to
-				#print msg
 				server = smtplib.SMTP(mta)
-				#server = smtplib.SMTP('golf.cs.princeton.edu')
 				server.sendmail(FROM, to,  msg)
 				if config.bcc and not config.debug:
 					server.sendmail(FROM, config.email,  msg)
@@ -361,17 +360,10 @@ def email(subject, text, to):
 			except Exception, err:
 				print "Mailer error2: failed using MTA(%s) with: %s" % (mta, err)
 	else:
-		#print "Would mail %s" %to
 		logger.debug("Would send mail to %s" % to)
 
 if __name__=="__main__":
 	import smtplib
 	import emailTxt
 	import plc 
-	#email("[spam] bcc test from golf.cs.princeton.edu", 
-	#	  "It gets to both recipients", 
-	#	  "soltesz@cs.utk.edu")
-	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])
+	emailViaRT("test monitor mail 9", "Let's see if this succeeds...", ["stephen.soltesz@gmail.com"])