Merge from trunk.

svn path=/branches/tk705/; revision=5891

1 files changed, 7 insertions, 0 deletions

diff --git a/rpki/async.py b/rpki/async.py
index 90117476..f2abd05d 100644
--- a/rpki/async.py
+++ b/rpki/async.py
@@ -350,6 +350,7 @@ class sync_wrapper(object):
 
   res = None
   err = None
+  fin = False
 
   def __init__(self, func):
     self.func = func
@@ -361,6 +362,8 @@ class sync_wrapper(object):
     """
 
     self.res = res
+    self.fin = True
+    logger.debug("%r callback with result %r", self, self.res)
     raise ExitNow
 
   def eb(self, err):
@@ -371,6 +374,8 @@ class sync_wrapper(object):
 
     exc_info = sys.exc_info()
     self.err = exc_info if exc_info[1] is err else err
+    self.fin = True
+    logger.debug("%r errback with exception %r", self, self.err)
     raise ExitNow
 
   def __call__(self, *args, **kwargs):
@@ -385,6 +390,8 @@ class sync_wrapper(object):
 
     event_defer(thunk)
     event_loop()
+    if not self.fin:
+      logger.warning("%r event_loop terminated without callback or errback", self)
     if self.err is None:
       return self.res
     elif isinstance(self.err, tuple):