X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=monitor_policy.py;h=45242eaf00c1d9ebd6d581b9e834f57caf11eb54;hp=f7c3edbeccd378e14b80f8797fe31155e0744cad;hb=6f2351e4b44590221425fa9b4bfa77c92db49b6a;hpb=19414270cf2c8429daab02fdebbd8081d9ba0db0

diff --git a/monitor_policy.py b/monitor_policy.py
index f7c3edb..45242ea 100644
--- a/monitor_policy.py
+++ b/monitor_policy.py
@@ -937,18 +937,22 @@ class Action:
 		if ADMIN & roles:
 			contacts += [config.email]
 		if TECH & roles:
-			contacts += [TECHEMAIL % loginbase]
+			#contacts += [TECHEMAIL % loginbase]
+			contacts += plc.getTechEmails(loginbase)
 		if PI & roles:
-			contacts += [PIEMAIL % loginbase]
+			#contacts += [PIEMAIL % loginbase]
+			contacts += plc.getPIEmails(loginbase)
 		if USER & roles:
+			contacts += plc.getSliceUserEmails(loginbase)
 			slices = plc.slices(loginbase)
 			if len(slices) >= 1:
-				for slice in slices:
-					contacts += [SLICEMAIL % slice]
 				print "SLIC: %20s : %d slices" % (loginbase, len(slices))
 			else:
 				print "SLIC: %20s : 0 slices" % loginbase
 
+		unique_contacts = set(contacts)
+		contacts = [ c for c in unique_contacts ]	# convert back into list
+
 		try:
 			subject = message[0] % args
 			body = message[1] % args