X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/7dd9d51f463e36e14b61e8d6455e56b9b7e50878..6f48da4ac71b5944d0464dd940ced3baf0d4311b:/peerdb/tripe-newpeers.in

diff --git a/peerdb/tripe-newpeers.in b/peerdb/tripe-newpeers.in
index 1213b904..0ba9cb61 100644
--- a/peerdb/tripe-newpeers.in
+++ b/peerdb/tripe-newpeers.in
@@ -51,6 +51,13 @@ class CDBFake (object):
 ###--------------------------------------------------------------------------
 ### A bulk DNS resolver.
 
+class ResolverFailure (Exception):
+  def __init__(me, host, msg):
+    me.host = host
+    me.msg = msg
+  def __str__(me):
+    return "failed to resolve `%s': %s" % (me.host, me.msg)
+
 class BulkResolver (object):
   """
   Resolve a number of DNS names in parallel.
@@ -92,7 +99,7 @@ class BulkResolver (object):
     """
     addr = me._namemap[host]
     if addr is None:
-      raise KeyError(host)
+      raise ResolverFailure(host, '(unknown failure)')
     return addr
 
   def _resolved(me, host, addr):
@@ -313,7 +320,7 @@ class ConfigSection (object):
     """
 
     ## Initialize for a depth-first walk of the inheritance graph.
-    seen = {}
+    seen = { 'name': True }
     visiting = { me.name: True }
     stack = [me]