aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rpkid/rpki/rpkid.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rpkid/rpki/rpkid.py b/rpkid/rpki/rpkid.py
index 11f09cf3..2781ff96 100644
--- a/rpkid/rpki/rpkid.py
+++ b/rpkid/rpki/rpkid.py
@@ -261,16 +261,16 @@ class main(object):
self.sql.ping()
match = self.up_down_url_regexp.search(path)
if match is None:
- raise rpki.exceptions.BadContactURL, "Bad path: %s" % path
+ raise rpki.exceptions.BadContactURL, "Bad URL path received in up_down_handler(): %s" % path
self_handle, child_handle = match.groups()
child = rpki.left_right.child_elt.sql_fetch_where1(self, "self.self_handle = %s AND child.child_handle = %s AND child.self_id = self.self_id",
(self_handle, child_handle), "self")
if child is None:
- raise rpki.exceptions.ChildNotFound, "Could not find child %s of self %s" % (child_handle, self_handle)
+ raise rpki.exceptions.ChildNotFound, "Could not find child %s of self %s in up_down_handler()" % (child_handle, self_handle)
child.serve_up_down(query, done)
except (rpki.async.ExitNow, SystemExit):
raise
- except rpki.exceptions.ChildNotFound, e:
+ except (rpki.exceptions.ChildNotFound, rpki.exceptions.BadContactURL), e:
rpki.log.warn(str(e))
cb(400, str(e))
except Exception, e: