From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 27 May 2018 17:14:42 +0000 (+0100)
Subject: peerdb/tripe-newpeers.in (BulkResolver): Add exception for resolution failure.
X-Git-Tag: 1.5.0~66
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/6f48da4ac71b5944d0464dd940ced3baf0d4311b

peerdb/tripe-newpeers.in (BulkResolver): Add exception for resolution failure.

There's a space for describing the error properly, but we can't do that
at the moment because mLib's background resolver isn't loved.
---

diff --git a/peerdb/tripe-newpeers.in b/peerdb/tripe-newpeers.in
index 00361d40..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):