added BootmanSequenceRecord to allow bootman sequence to be modified at

[monitor.git] / monitor / common.py

diff --git a/monitor/common.py b/monitor/common.py
index 6fca571..05a4ec2 100644 (file)
--- 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
 
@@ -228,7 +228,7 @@ def email_exception(content=None, title=None):
         full_title = "exception running monitor %s" % title
 
     m=Message(full_title, msg, False)
-    m.send([config.cc_email])
+    m.send([config.exception_email])
     return
 
 def changed_lessthan(last_changed, days):
@@ -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