X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fdatabase%2Finfo%2Ffindbad.py;h=566c2aefb5822fb5dd432165c4125096f6a6c7d0;hb=f9da3f16b608452f4166050e93044fbb20fc5e6d;hp=f147a92615314a6843d5e4909834b18ddcf570eb;hpb=54d1dc48232619d462145528734cb54ea0c616b8;p=monitor.git diff --git a/monitor/database/info/findbad.py b/monitor/database/info/findbad.py index f147a92..566c2ae 100644 --- 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") - 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") - 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): @@ -79,12 +85,15 @@ class FindbadNodeRecord(Entity): 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): - fbsync = cls.get_by(hostname="global") + fbsync = FindbadPCURecordSync.get_by(plc_pcuid=0) kwargs['round'] = fbsync.round return cls.query.filter_by(**kwargs) # ACCOUNTING