From f0edc94f59ba82bef04d0576174035fd0f67a649 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Fri, 1 Aug 2014 16:43:00 +0200 Subject: Reporting: do not duplicate isstale functionality The interaction entries have a isstale() method, we do not need a template tag, that tries to figure out this on its own. The isstale() method works even better: It knows, if the interaction is the current interaction and compares the timestamp to the current time or (if it is not the current one) it compares the timestamp to the timestamp of the next interaction. So using the method of the model, you can browse the interaction history and see, if the host was stale some time in the past. Previously all interactions more than 24h ago were marked stale. --- src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py') diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py index ceb9f5d91..4a93e77e0 100644 --- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py +++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py @@ -188,19 +188,6 @@ def build_metric_list(mdict): return td_list -@register.filter -def isstale(timestamp, entry_max=None): - """ - Check for a stale timestamp - - Compares two timestamps and returns True if the - difference is greater then 24 hours. - """ - if not entry_max: - entry_max = datetime.now() - return entry_max - timestamp > timedelta(hours=24) - - @register.filter def sort_interactions_by_name(value): """ @@ -318,7 +305,7 @@ def determine_client_state(entry): dirty. If the client is reporting dirty, this will figure out just _how_ dirty and adjust the color accordingly. """ - if isstale(entry.timestamp): + if entry.isstale(): return "stale-lineitem" if entry.state == 'clean': if entry.extra_count > 0: -- cgit v1.2.3-1-g7c22