Cleanup some of the litter left behind during conversion to callbacks.

Add rpki.async.iterator.__repr__() so we can figure out where the
silly things were created when debugging.  Fix sloppy child process
shutdown in testbed.main(); I don't know why this only started
complaining now, but it did, so I fixed it.

svn path=/rpkid/pubd.py; revision=2426

1 files changed, 11 insertions, 2 deletions

diff --git a/rpkid/pubd.py b/rpkid/pubd.py
index 5fb04dcb..1ea6f00e 100755
--- a/rpkid/pubd.py
+++ b/rpkid/pubd.py
@@ -65,10 +65,14 @@ class pubd_context(object):
     """
     Process one PDU from the IRBE.
     """
+
+    def done(x):
+      cb(200, x)
+
     rpki.log.trace()
     try:
       self.sql.ping()
-      self.handler_common(query, None, lambda x: cb(200, x), (self.bpki_ta, self.irbe_cert))
+      self.handler_common(query, None, done, (self.bpki_ta, self.irbe_cert))
     except rpki.async.ExitNow:
       raise
     except Exception, data:
@@ -79,6 +83,11 @@ class pubd_context(object):
     """
     Process one PDU from a client.
     """
+
+    def done(x):
+      cb(200, x)
+
+
     rpki.log.trace()
     try:
       self.sql.ping()
@@ -91,7 +100,7 @@ class pubd_context(object):
       config = rpki.publication.config_elt.fetch(self)
       if config is None or config.bpki_crl is None:
         raise rpki.exceptions.CMSCRLNotSet
-      self.handler_common(query, client, lambda x: cb(200, x), (self.bpki_ta, client.bpki_cert, client.bpki_glue), config.bpki_crl)
+      self.handler_common(query, client, done, (self.bpki_ta, client.bpki_cert, client.bpki_glue), config.bpki_crl)
     except rpki.async.ExitNow:
       raise
     except Exception, data: