git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from:
[monitor.git]
/
monitor_policy.py
diff --git
a/monitor_policy.py
b/monitor_policy.py
index
f7c3edb
..
45242ea
100644
(file)
--- a/
monitor_policy.py
+++ b/
monitor_policy.py
@@
-937,18
+937,22
@@
class Action:
if ADMIN & roles:
contacts += [config.email]
if TECH & roles:
if ADMIN & roles:
contacts += [config.email]
if TECH & roles:
- contacts += [TECHEMAIL % loginbase]
+ #contacts += [TECHEMAIL % loginbase]
+ contacts += plc.getTechEmails(loginbase)
if PI & roles:
if PI & roles:
- contacts += [PIEMAIL % loginbase]
+ #contacts += [PIEMAIL % loginbase]
+ contacts += plc.getPIEmails(loginbase)
if USER & roles:
if USER & roles:
+ contacts += plc.getSliceUserEmails(loginbase)
slices = plc.slices(loginbase)
if len(slices) >= 1:
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
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
try:
subject = message[0] % args
body = message[1] % args