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
add functions for pcuview, nodeview, & siteview
[monitor.git]
/
monitor
/
database
/
info
/
findbad.py
diff --git
a/monitor/database/info/findbad.py
b/monitor/database/info/findbad.py
index
f147a92
..
566c2ae
100644
(file)
--- a/
monitor/database/info/findbad.py
+++ b/
monitor/database/info/findbad.py
@@
-22,13
+22,19
@@
class FindbadNodeRecord(Entity):
@classmethod
def get_all_latest(cls):
fbsync = FindbadNodeRecordSync.get_by(hostname="global")
@classmethod
def get_all_latest(cls):
fbsync = FindbadNodeRecordSync.get_by(hostname="global")
- return cls.query.filter_by(round=fbsync.round)
+ if fbsync:
+ return cls.query.filter_by(round=fbsync.round)
+ else:
+ return []
@classmethod
def get_latest_by(cls, **kwargs):
fbsync = FindbadNodeRecordSync.get_by(hostname="global")
@classmethod
def get_latest_by(cls, **kwargs):
fbsync = FindbadNodeRecordSync.get_by(hostname="global")
- kwargs['round'] = fbsync.round
- return cls.query.filter_by(**kwargs)
+ if fbsync:
+ kwargs['round'] = fbsync.round
+ return cls.query.filter_by(**kwargs)
+ else:
+ return []
@classmethod
def get_latest_n_by(cls, n=3, **kwargs):
@classmethod
def get_latest_n_by(cls, n=3, **kwargs):
@@
-79,12
+85,15
@@
class FindbadNodeRecord(Entity):
class FindbadPCURecord(Entity):
@classmethod
def get_all_latest(cls):
class FindbadPCURecord(Entity):
@classmethod
def get_all_latest(cls):
- fbsync = cls.get_by(hostname="global")
- return cls.query.filter_by(round=fbsync.round)
+ fbsync = FindbadPCURecordSync.get_by(plc_pcuid=0)
+ if fbsync:
+ return cls.query.filter_by(round=fbsync.round)
+ else:
+ return []
@classmethod
def get_latest_by(cls, **kwargs):
@classmethod
def get_latest_by(cls, **kwargs):
- fbsync =
cls.get_by(hostname="global"
)
+ fbsync =
FindbadPCURecordSync.get_by(plc_pcuid=0
)
kwargs['round'] = fbsync.round
return cls.query.filter_by(**kwargs)
# ACCOUNTING
kwargs['round'] = fbsync.round
return cls.query.filter_by(**kwargs)
# ACCOUNTING