aboutsummaryrefslogtreecommitdiff
path: root/rpki/adns.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2015-10-22 02:02:23 +0000
committerRob Austein <sra@hactrn.net>2015-10-22 02:02:23 +0000
commit32d43381dfc0370acb774951f9cdd0cdb1ab7f1b (patch)
treecfb37241df8d869ed08a24b3021a4a599cb98bdb /rpki/adns.py
parent1ca142b706eab552f9e2c575ef15d1862516393b (diff)
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
Diffstat (limited to 'rpki/adns.py')
-rw-r--r--rpki/adns.py5
1 files changed, 2 insertions, 3 deletions
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)