X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mailmonitor.py;h=fab3e65ab572a4bd591399cc02d44b231ddaa361;hb=ad64c5a61ce63a0299bb3e80131455323c0a6bef;hp=848196608a5d469516dd634152bf5ca78b831c0b;hpb=da913fbd1629fc4669b186915df8ff3a340482d3;p=monitor.git

diff --git a/mailmonitor.py b/mailmonitor.py
index 8481966..fab3e65 100644
--- a/mailmonitor.py
+++ b/mailmonitor.py
@@ -6,15 +6,15 @@
 #
 # $Id: monitor.py,v 1.7 2007/07/03 19:59:02 soltesz Exp $
 
-import database
-
-import rt
 import sys
 
-import plc
-api = plc.getAuthAPI()
-
+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()
 
 def reboot(hostname):
 	print "CALLING: mailmonitor.reboot(%s)" % hostname
@@ -23,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)