diff options
Diffstat (limited to 'mirrors')
| -rw-r--r-- | mirrors/utils.py | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/mirrors/utils.py b/mirrors/utils.py index bbbaca26..5c8bff3b 100644 --- a/mirrors/utils.py +++ b/mirrors/utils.py @@ -5,10 +5,10 @@ from .models import MirrorLog, MirrorProtocol, MirrorUrl import datetime -cutoff_time = datetime.datetime.utcnow() - datetime.timedelta(hours=24) @cache_function(300) def get_mirror_statuses(): + cutoff_time = datetime.datetime.utcnow() - datetime.timedelta(hours=24) protocols = MirrorProtocol.objects.exclude(protocol__iexact='rsync') # I swear, this actually has decent performance... urls = MirrorUrl.objects.select_related( @@ -18,15 +18,27 @@ def get_mirror_statuses(): logs__check_time__gte=cutoff_time).annotate( check_count=Count('logs'), last_sync=Max('logs__last_sync'), last_check=Max('logs__check_time'), - duration_avg=Avg('logs__duration'), duration_min=Min('logs__duration'), - duration_max=Max('logs__duration'), duration_stddev=StdDev('logs__duration') + duration_avg=Avg('logs__duration'), + duration_stddev=StdDev('logs__duration') ).order_by('-last_sync', '-duration_avg') + # The Django ORM makes it really hard to get actual average delay in the + # above query, so run a seperate query for it and we will process the + # results here. + times = MirrorLog.objects.filter(is_success=True, last_sync__isnull=False, + check_time__gte=cutoff_time) + delays = {} + for log in times: + d = log.check_time - log.last_sync + delays.setdefault(log.url_id, []).append(d) + for url in urls: - if url.last_check and url.last_sync: - d = url.last_check - url.last_sync + if url.id in delays: + url_delays = delays[url.id] + d = sum(url_delays, datetime.timedelta()) / len(url_delays) url.delay = d - url.score = d.days * 24 + d.seconds / 3600 + url.duration_avg + url.duration_stddev + hours = d.days * 24.0 + d.seconds / 3600.0 + url.score = hours + url.duration_avg + url.duration_stddev else: url.delay = None url.score = None @@ -34,6 +46,7 @@ def get_mirror_statuses(): @cache_function(300) def get_mirror_errors(): + cutoff_time = datetime.datetime.utcnow() - datetime.timedelta(hours=24) errors = MirrorLog.objects.filter( is_success=False, check_time__gte=cutoff_time).values( 'url__url', 'url__protocol__protocol', 'url__mirror__country', |