diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-14 15:07:59 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-14 15:07:59 -0600 |
| commit | d10acd3ebf889fc50054b4da9c1962bad79533e1 (patch) | |
| tree | 38970704a658d9ed31585c5518007d48ade6bac6 /mirrors | |
| parent | 9b6561a2c1a99023a5cad68a1763a07c4aecae8d (diff) | |
| parent | 7f7598cf43e6b630ac21bc9a435773773213ea60 (diff) | |
Merge branch 'archweb-generic2'
Conflicts:
Makefile
templates/public/index.html
Diffstat (limited to 'mirrors')
| -rw-r--r-- | mirrors/management/commands/mirrorcheck.py | 5 | ||||
| -rw-r--r-- | mirrors/models.py | 1 | ||||
| -rw-r--r-- | mirrors/utils.py | 2 | ||||
| -rw-r--r-- | mirrors/views.py | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py index 6faf294a..3f026c36 100644 --- a/mirrors/management/commands/mirrorcheck.py +++ b/mirrors/management/commands/mirrorcheck.py @@ -179,10 +179,11 @@ def check_rsync_url(mirror_url, location, timeout): rsync_cmd.append(lastsync_path) try: with open(os.devnull, 'w') as devnull: - logger.debug("rsync cmd: %s", ' '.join(rsync_cmd)) + if logger.isEnabledFor(logging.DEBUG): + logger.debug("rsync cmd: %s", ' '.join(rsync_cmd)) + start = time.time() proc = subprocess.Popen(rsync_cmd, stdout=devnull, stderr=subprocess.PIPE) - start = time.time() _, errdata = proc.communicate() end = time.time() log.duration = end - start diff --git a/mirrors/models.py b/mirrors/models.py index 975ead39..da3d8c0d 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -116,6 +116,7 @@ class MirrorRsync(models.Model): class Meta: verbose_name = 'mirror rsync IP' + ordering = ('ip',) class CheckLocation(models.Model): diff --git a/mirrors/utils.py b/mirrors/utils.py index e98b5c9f..bba8e36b 100644 --- a/mirrors/utils.py +++ b/mirrors/utils.py @@ -21,7 +21,7 @@ def dictfetchall(cursor): for row in cursor.fetchall() ] - +@cache_function(178) def status_data(cutoff_time, mirror_id=None): if mirror_id is not None: params = [cutoff_time, mirror_id] diff --git a/mirrors/views.py b/mirrors/views.py index 6f4ad838..ec056696 100644 --- a/mirrors/views.py +++ b/mirrors/views.py @@ -161,7 +161,7 @@ def mirror_details(request, name): status_info = get_mirror_statuses(mirror_id=mirror.id) checked_urls = {url for url in status_info['urls'] \ if url.mirror_id == mirror.id} - all_urls = set(mirror.urls.select_related('protocol')) + all_urls = set(mirror.urls.filter(active=True).select_related('protocol')) # Add dummy data for URLs that we haven't checked recently other_urls = all_urls.difference(checked_urls) for url in other_urls: |