give a hint about where TimeoutError messages are coming from

diff --git a/nattraverso/pynupnp/upnp.py b/nattraverso/pynupnp/upnp.py
index 1944b24..c3bea75 100644 (file)
--- a/nattraverso/pynupnp/upnp.py
+++ b/nattraverso/pynupnp/upnp.py
@@ -517,7 +517,7 @@ class UPnPProtocol(DatagramProtocol, object):
             return
         self._done = True
         self.mcast.stopListening()
-        self._discovery.errback(failure.Failure(defer.TimeoutError()))
+        self._discovery.errback(failure.Failure(defer.TimeoutError('in _on_discovery_timeout')))
 
 def search_upnp_device ():
     """

diff --git a/p2pool/util/deferral.py b/p2pool/util/deferral.py
index 600fd90..d5901b5 100644 (file)
--- a/p2pool/util/deferral.py
+++ b/p2pool/util/deferral.py
@@ -48,7 +48,7 @@ class ReplyMatcher(object):
         df = defer.Deferred()
         def timeout():
             df, timer = self.map[id].pop(uniq)
-            df.errback(failure.Failure(defer.TimeoutError()))
+            df.errback(failure.Failure(defer.TimeoutError('in ReplyMatcher')))
             if not self.map[id]:
                 del self.map[id]
         self.map.setdefault(id, {})[uniq] = (df, reactor.callLater(self.timeout, timeout))
@@ -80,7 +80,7 @@ class GenericDeferrer(object):
         df = defer.Deferred()
         def timeout():
             self.map.pop(id)
-            df.errback(failure.Failure(defer.TimeoutError()))
+            df.errback(failure.Failure(defer.TimeoutError('in GenericDeferrer')))
         timer = reactor.callLater(self.timeout, timeout)
         self.func(id, *args, **kwargs)
         self.map[id] = df, timer

diff --git a/p2pool/util/variable.py b/p2pool/util/variable.py
index b9024ee..660fdb0 100644 (file)
--- a/p2pool/util/variable.py
+++ b/p2pool/util/variable.py
@@ -40,7 +40,7 @@ class Event(object):
         id1 = once.watch(lambda *event: df.callback(event))
         if timeout is not None:
             def do_timeout():
-                df.errback(failure.Failure(defer.TimeoutError()))
+                df.errback(failure.Failure(defer.TimeoutError('in Event.get_deferred')))
                 once.unwatch(id1)
                 once.unwatch(x)
             delay = reactor.callLater(timeout, do_timeout)