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
handle IndexError in getpcu
[monitor.git]
/
monitor
/
common.py
diff --git
a/monitor/common.py
b/monitor/common.py
index
6fca571
..
850d36b
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
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
from monitor.wrapper import plc
from datetime import datetime, timedelta
@@
-43,12
+43,17
@@
def get_current_state(fbnode):
return l
def color_pcu_state(fbnode):
return l
def color_pcu_state(fbnode):
+ if fbnode['plc_pcuid'] is None:
+ return 'NOPCU'
+ else:
+ return 'PCU'
if 'plcnode' in fbnode and 'pcu_ids' in fbnode['plcnode'] and len(fbnode['plcnode']['pcu_ids']) > 0 :
values = reboot.get_pcu_values(fbnode['plcnode']['pcu_ids'][0])
if values == None:
return fbnode['pcu']
else:
if 'plcnode' in fbnode and 'pcu_ids' in fbnode['plcnode'] and len(fbnode['plcnode']['pcu_ids']) > 0 :
values = reboot.get_pcu_values(fbnode['plcnode']['pcu_ids'][0])
if values == None:
return fbnode['pcu']
else:
+ print fbnode.keys()
if 'pcu' not in fbnode:
return 'NOPCU'
else:
if 'pcu' not in fbnode:
return 'NOPCU'
else:
@@
-209,9
+214,9
@@
def get_nodeset(config):
# perform this query after the above options, so that the filter above
# does not break.
if config.nodeselect:
# 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 ]
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
return l_nodes
@@
-228,7
+233,7
@@
def email_exception(content=None, title=None):
full_title = "exception running monitor %s" % title
m=Message(full_title, msg, False)
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):
return
def changed_lessthan(last_changed, days):
@@
-240,6
+245,9
@@
def changed_lessthan(last_changed, days):
return False
def changed_greaterthan(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
if datetime.now() - last_changed > timedelta(days):
#print "last changed more than %s" % timedelta(days)
return True