diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-03-06 14:13:36 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-03-06 14:13:36 +0000 |
| commit | 3ee286527f1ec23ead2c11201b9fa504a5bf6208 (patch) | |
| tree | 8a9f605f751126c884139a6b3baa2835684ed22b /mirrors/management/commands/mirrorresolv.py | |
| parent | 2c2614c48957c32334aa9ba317db935a979cd67f (diff) | |
| parent | fee4c20e9607ccc479c33b2476fa1ba709efe607 (diff) | |
Merge branch 'master' of /srv/git/projects/parabolaweb
Conflicts:
.gitignore
Diffstat (limited to 'mirrors/management/commands/mirrorresolv.py')
| -rw-r--r-- | mirrors/management/commands/mirrorresolv.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mirrors/management/commands/mirrorresolv.py b/mirrors/management/commands/mirrorresolv.py index 8cbd51a3..8a628bd4 100644 --- a/mirrors/management/commands/mirrorresolv.py +++ b/mirrors/management/commands/mirrorresolv.py @@ -12,7 +12,6 @@ from django.core.management.base import NoArgsCommand import sys import logging -from urlparse import urlparse import socket from mirrors.models import MirrorUrl @@ -42,15 +41,13 @@ def resolve_mirrors(): logger.debug("requesting list of mirror URLs") for mirrorurl in MirrorUrl.objects.filter(mirror__active=True): try: - hostname = urlparse(mirrorurl.url).hostname - logger.debug("resolving %3i (%s)", mirrorurl.id, hostname) - info = socket.getaddrinfo(hostname, None, 0, socket.SOCK_STREAM) - families = [x[0] for x in info] + logger.debug("resolving %3i (%s)", mirrorurl.id, mirrorurl.hostname) + families = mirrorurl.address_families() mirrorurl.has_ipv4 = socket.AF_INET in families mirrorurl.has_ipv6 = socket.AF_INET6 in families - logger.debug("%s: v4: %s v6: %s", hostname, + logger.debug("%s: v4: %s v6: %s", mirrorurl.hostname, mirrorurl.has_ipv4, mirrorurl.has_ipv6) - mirrorurl.save() + mirrorurl.save(force_update=True) except socket.error, e: logger.warn("error resolving %s: %s", hostname, e) |