From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Tue, 20 May 2008 19:42:15 +0000 (+0000)
Subject: allow RT module to be removed.
X-Git-Tag: Monitor-1.0-5~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ff39dc85bb77db981d3e8a7601d5982ad47ac73c;p=monitor.git

allow RT module to be removed.
---

diff --git a/policy.py b/policy.py
index 3673b8e..2019462 100644
--- a/policy.py
+++ b/policy.py
@@ -482,12 +482,19 @@ class Diagnose(Thread):
 					diag_record['message'] = emailTxt.mailtxt.pcutonodemapping
 					diag_record['email_pcu'] = True
 
-			if diag_record['ticket_id'] == "":
-				diag_record['log'] = "DOWN: %20s : %-40s == %20s %s" % \
-					(loginbase, nodename, diag_record['info'][1:], diag_record['found_rt_ticket'])
+			if 'ticket_id' in diag_record:
+				if diag_record['ticket_id'] == "":
+					if 'found_rt_ticket' in diag_record:
+						ticket_id = diag_record['found_rt_ticket']
+					else:
+						ticket_id = "None"
+				else:
+					ticket_id = diag_record['ticket_id']
 			else:
-				diag_record['log'] = "DOWN: %20s : %-40s == %20s %s" % \
-					(loginbase, nodename, diag_record['info'][1:], diag_record['ticket_id'])
+				ticket_id = "None"
+
+			diag_record['log'] = "DOWN: %20s : %-40s == %20s %s" % \
+					(loginbase, nodename, diag_record['info'][1:], ticket_id)
 
 		elif "OLDBOOTCD" in category:
 			# V2 boot cds as determined by findbad