X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fmailer.py;h=34a8553f81712701b61c042ee94e1db320a02860;hb=0a896f10303078562b737c83fd08dc25f0973c58;hp=d3f5df4b232506eeaf9bca420b35f775dd5f70ac;hpb=ef6d37ec66505d570853fa69a6a29109ce2042ec;p=monitor.git

diff --git a/monitor/wrapper/mailer.py b/monitor/wrapper/mailer.py
index d3f5df4..34a8553 100755
--- a/monitor/wrapper/mailer.py
+++ b/monitor/wrapper/mailer.py
@@ -28,7 +28,7 @@ def reformat_for_rt(text):
 		
 
 def _setupRTenvironment():
-	os.environ['PATH'] = os.environ['PATH'] + ":" + config.RT_WEB_TOOLS_PATH
+	os.environ['PATH'] = config.RT_WEB_TOOLS_PATH + ":" + os.environ['PATH']
 	os.environ['RTSERVER'] = config.RT_WEB_SERVER
 	os.environ['RTUSER']   = config.RT_WEB_USER
 	os.environ['RTPASSWD'] = config.RT_WEB_PASSWORD
@@ -41,6 +41,7 @@ def setTicketStatus(ticket_id, status):
 		return {}
 
 	cmd = "rt edit ticket/%s set status=%s" % (ticket_id, status)
+	print cmd
 	(f_in, f_out, f_err) = os.popen3(cmd)
 	value = f_out.read()
 	l_values = value.split('\n')
@@ -51,7 +52,8 @@ def getTicketStatus(ticket_id):
 	if ticket_id == None or ticket_id == "":
 		return {}
 
-	cmd = "rt show -t ticket -f id,subject,status,queue,created %s" % (ticket_id)
+	cmd = "rt show -t ticket -f id,subject,status,queue,created,told %s" % (ticket_id)
+	print cmd
 	(f_in, f_out, f_err) = os.popen3(cmd)
 	value = f_out.read()
 	l_values = value.split('\n')
@@ -63,7 +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']))
+	#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):
@@ -78,6 +85,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)
+	print cmd
 	(f_in, f_out, f_err) = os.popen3(cmd)
 	value = f_out.read()
 	l_values = value.split()
@@ -101,6 +109,7 @@ def setSubjectViaRT(ticket_id, subject):
 	i_ticket_id = int(ticket_id)
 
 	cmd = "rt edit ticket/%s set subject='%s'" % (ticket_id, subject)
+	print cmd
 	(f_in, f_out, f_err) = os.popen3(cmd)
 	value = f_out.read()
 	l_values = value.split()
@@ -125,9 +134,11 @@ def addCommentViaRT(ticket_id, comment):
 	i_ticket_id = int(ticket_id)
 
 	cmd = "rt comment -m '%s' ticket/%s" % (comment, i_ticket_id)
+	print cmd
 	(f_in, f_out, f_err) = os.popen3(cmd)
 	value = f_out.read()
 	l_values = value.split()
+	l_err = f_err.read()
 	f_in.close() ; f_out.close() ; f_err.close()
 	if len(l_values) > 1 and "recorded" in l_values[1]:
 		# Success
@@ -136,6 +147,7 @@ def addCommentViaRT(ticket_id, comment):
 		# Error
 		f_in.close() ; f_out.close() ; f_err.close()
 		print "ERROR: RT failed to add comment to id %s" % ticket_id
+		print "ERROR: %s" % l_err
 
 	return
 
@@ -153,6 +165,7 @@ def closeTicketViaRT(ticket_id, comment):
 
 	if not config.debug:
 		cmd = "rt edit ticket/%s set status=resolved" % i_ticket_id
+		print cmd
 		(f_in, f_out, f_err) = os.popen3(cmd)
 		f_in.close()
 		value = f_out.read()
@@ -184,8 +197,10 @@ def emailViaRT(subject, text, to, ticket_id=None):
 		setAdminCCViaRT(ticket_id, to)
 
 		cmd = "rt correspond -m - %s" % ticket_id
+		print cmd
 		(f_in, f_out, f_err) = os.popen3(cmd)
-		f_in.write(text)
+		#f_in.write(input[:32000])
+		f_in.write(text[:32000])
 		f_in.flush()
 		f_in.close()
 		value = f_out.read()
@@ -222,6 +237,7 @@ def emailViaRT_NoTicket(subject, text, to):
 	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 += "Text: %s"
 
 	# Add a space for each new line to get RT to accept the file.
@@ -229,8 +245,14 @@ def emailViaRT_NoTicket(subject, text, to):
 
 	if config.mail and not config.debug:
 		cmd = "rt create -i -t ticket"
+		print cmd
 		(f_in, f_out, f_err) = os.popen3(cmd)
-		f_in.write(input_text % (subject, spaced_text))
+		input = input_text % (subject, spaced_text)
+		print "length: %s" % len(input)
+		# NOTE: RT hangs with larger input, probably due to some internal
+		# buffering.  So, chop off messages at 32000
+		#f_in.write(input[:32000])
+		f_in.write(input[:32000])
 		f_in.flush()
 		f_in.close()
 		value = f_out.read()
@@ -321,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)
@@ -343,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])