From 32d43381dfc0370acb774951f9cdd0cdb1ab7f1b Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 22 Oct 2015 02:02:23 +0000 Subject: First cut at replacing rpkid's HTTP and I/O system with Tornado. Not quite working perfectly yet (cron is a bit wonky) but manages to produce an initial set of ROAs without thowing any exceptions, and code is already much cleaner than the old callback-based horror. svn path=/branches/tk705/; revision=6139 --- rpki/adns.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'rpki/adns.py') diff --git a/rpki/adns.py b/rpki/adns.py index 018bb7cf..c5af3549 100644 --- a/rpki/adns.py +++ b/rpki/adns.py @@ -27,7 +27,6 @@ import time import socket import logging import asyncore -import rpki.async import rpki.sundial import rpki.log @@ -62,12 +61,12 @@ for ns in resolver.nameservers: try: nameservers.append((socket.AF_INET, dns.ipv4.inet_aton(ns))) continue - except Exception: + except: pass try: nameservers.append((socket.AF_INET6, dns.ipv6.inet_aton(ns))) continue - except Exception: + except: pass logger.error("Couldn't parse nameserver address %r", ns) -- cgit v1.2.3