X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fcommon.py;h=05a4ec261ed10897f27007e7f5ef707145817c72;hb=e9c0ede93fd45d4de5d0b4bcd3ec81a55f9b5ffa;hp=d3dc895ead981ecbbebb33f683f649afcf5933c8;hpb=40884a302bf204a7f42044b72d87f9431ad6dd35;p=monitor.git

diff --git a/monitor/common.py b/monitor/common.py
index d3dc895..05a4ec2 100644
--- a/monitor/common.py
+++ b/monitor/common.py
@@ -3,7 +3,7 @@ import time
 import struct
 from monitor import reboot
 from monitor import util
-from monitor import database
+from monitor import query
 from monitor.wrapper import plc
 
 from datetime import datetime, timedelta
@@ -209,9 +209,9 @@ def get_nodeset(config):
 	# perform this query after the above options, so that the filter above
 	# does not break.
 	if config.nodeselect:
-		fbquery = FindbadNodeRecord.get_all_latest()
+		fbquery = HistoryNodeRecord.query.all()
 		node_list = [ n.hostname for n in fbquery ]
-		l_nodes = node_select(config.nodeselect, node_list, None)
+		l_nodes = query.node_select(config.nodeselect, node_list, None)
 
 	return l_nodes
 
@@ -240,6 +240,9 @@ def changed_lessthan(last_changed, days):
 		return False
 
 def changed_greaterthan(last_changed, days):
+	if last_changed is None:
+		return False
+
 	if datetime.now() - last_changed > timedelta(days):
 		#print "last changed more than %s" % timedelta(days)
 		return True