Merge tag 'release_2012-01-11'

Pkgbase view in todos, other changes related to caching

Conflicts:
	public/views.py

1 files changed, 3 insertions, 4 deletions

diff --git a/mirrors/utils.py b/mirrors/utils.py
index 8518b3ba..f05ffc77 100644
--- a/mirrors/utils.py
+++ b/mirrors/utils.py
@@ -26,7 +26,7 @@ def annotate_url(url, delays):
         url.delay = None
         url.score = None
 
-@cache_function(300)
+@cache_function(123)
 def get_mirror_statuses(cutoff=default_cutoff):
     cutoff_time = datetime.datetime.utcnow() - cutoff
     protocols = list(MirrorProtocol.objects.filter(is_download=True))
@@ -40,8 +40,7 @@ def get_mirror_statuses(cutoff=default_cutoff):
             last_sync=Max('logs__last_sync'),
             last_check=Max('logs__check_time'),
             duration_avg=Avg('logs__duration'),
-            #duration_stddev=StdDev('logs__duration')
-            duration_stddev=Max('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
@@ -81,7 +80,7 @@ def get_mirror_statuses(cutoff=default_cutoff):
         'urls': urls,
     }
 
-@cache_function(300)
+@cache_function(117)
 def get_mirror_errors(cutoff=default_cutoff):
     cutoff_time = datetime.datetime.utcnow() - cutoff
     errors = MirrorLog.objects.filter(