Merge branch 'archweb-generic' into master-nomake

Conflicts:
	README.md

1 files changed, 14 insertions, 11 deletions

diff --git a/mirrors/utils.py b/mirrors/utils.py
index 633731a7..0dd26ae0 100644
--- a/mirrors/utils.py
+++ b/mirrors/utils.py
@@ -22,7 +22,8 @@ def dictfetchall(cursor):
     ]
 
 @cache_function(178)
-def status_data(cutoff_time, mirror_id=None):
+def status_data(cutoff=DEFAULT_CUTOFF, mirror_id=None):
+    cutoff_time = now() - cutoff
     if mirror_id is not None:
         params = [cutoff_time, mirror_id]
         mirror_where = 'AND u.mirror_id = %s'
@@ -113,20 +114,19 @@ def annotate_url(url, url_data):
         url.score = (hours + url.duration_avg + stddev) / divisor
 
 
-def get_mirror_statuses(cutoff=DEFAULT_CUTOFF, mirror_id=None):
+def get_mirror_statuses(cutoff=DEFAULT_CUTOFF, mirror_id=None, show_all=False):
     cutoff_time = now() - cutoff
 
-    # TODO: this prevents grabbing data points from any mirror that was active,
-    # receiving checks, and then marked private. we can probably be smarter and
-    # filter the data later?
-    valid_urls = MirrorUrl.objects.filter(active=True,
-            mirror__active=True, mirror__public=True,
+    valid_urls = MirrorUrl.objects.filter(
             logs__check_time__gte=cutoff_time).distinct()
 
     if mirror_id:
         valid_urls = valid_urls.filter(mirror_id=mirror_id)
+    if not show_all:
+        valid_urls = valid_urls.filter(active=True, mirror__active=True,
+                mirror__public=True)
 
-    url_data = status_data(cutoff_time, mirror_id)
+    url_data = status_data(cutoff, mirror_id)
     urls = MirrorUrl.objects.select_related('mirror', 'protocol').filter(
             id__in=valid_urls).order_by('mirror__id', 'url')
 
@@ -159,11 +159,11 @@ def get_mirror_statuses(cutoff=DEFAULT_CUTOFF, mirror_id=None):
     }
 
 
-def get_mirror_errors(cutoff=DEFAULT_CUTOFF, mirror_id=None):
+def get_mirror_errors(cutoff=DEFAULT_CUTOFF, mirror_id=None, show_all=False):
     cutoff_time = now() - cutoff
     errors = MirrorLog.objects.filter(
-            is_success=False, check_time__gte=cutoff_time, url__active=True,
-            url__mirror__active=True, url__mirror__public=True).values(
+            is_success=False, check_time__gte=cutoff_time,
+            url__mirror__public=True).values(
             'url__url', 'url__country', 'url__protocol__protocol',
             'url__mirror__tier', 'error').annotate(
             error_count=Count('error'), last_occurred=Max('check_time')
@@ -171,6 +171,9 @@ def get_mirror_errors(cutoff=DEFAULT_CUTOFF, mirror_id=None):
 
     if mirror_id:
         errors = errors.filter(url__mirror_id=mirror_id)
+    if not show_all:
+        errors = errors.filter(url__active=True, url__mirror__active=True,
+                url__mirror__public=True)
 
     errors = list(errors)
     for err in errors: