X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=mailmonitor.py;h=fab3e65ab572a4bd591399cc02d44b231ddaa361;hb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad;hp=8af368abe834e9f816754f8aefb862ddb5fcbd23;hpb=c678c008f0c3a10947b38880e52005a856e1b122;p=monitor.git

diff --git a/mailmonitor.py b/mailmonitor.py
index 8af368a..fab3e65 100644
--- a/mailmonitor.py
+++ b/mailmonitor.py
@@ -12,6 +12,7 @@ from monitor import database
 from monitor.wrapper import rt
 from monitor.wrapper import plc
 from monitor.policy import *
+from monitor.database.info.model import *
 
 api = plc.getAuthAPI()
 
@@ -22,9 +23,9 @@ def reboot(hostname):
 	if len(l_nodes) == 0:
 		raise Exception("No such host: %s" % hostname)
 	
-	l_blacklist = database.if_cached_else(1, "l_blacklist", lambda : [])
-	l_ticket_blacklist = database.if_cached_else(1,"l_ticket_blacklist",lambda : [])
+	q_blacklist = BlacklistRecord.query.all()
 
+	l_blacklist = [ n.hostname for n in q_blacklist ]
 	l_nodes  = filter(lambda x : not x['hostname'] in l_blacklist, l_nodes)
 	if len(l_nodes) == 0:
 		raise Exception("Host removed via blacklist: %s" % hostname)