From b898caea9a0ca526db0e9217af981052b5fe9355 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 30 Dec 2013 15:34:25 +0100 Subject: [PATCH] mirrors: Fix resolving hostnames. --- webapp/backend/mirrors.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/webapp/backend/mirrors.py b/webapp/backend/mirrors.py index b276a809..71d19609 100644 --- a/webapp/backend/mirrors.py +++ b/webapp/backend/mirrors.py @@ -314,7 +314,11 @@ class Mirror(Object): @property def address(self): - return socket.gethostbyname(self.hostname) + for addr in self.addresses4: + return addr + + for addr in self.addresses6: + return addr @property def owner(self): @@ -603,7 +607,10 @@ class Mirror(Object): @property def addresses(self): if not hasattr(self, "__addresses"): - addrinfo = socket.getaddrinfo(self.hostname, 0, socket.AF_UNSPEC, socket.SOCK_STREAM) + try: + addrinfo = socket.getaddrinfo(self.hostname, 0, socket.AF_UNSPEC, socket.SOCK_STREAM) + except: + raise Exception("Could not resolve %s" % self.hostname) ret = [] for family, socktype, proto, canonname, address in addrinfo: -- 2.47.3