Consume ping errors so they aren't printed in the log.

[quix0rs-apt-p2p.git] / apt_p2p_Khashmir / khashmir.py

diff --git a/apt_p2p_Khashmir/khashmir.py b/apt_p2p_Khashmir/khashmir.py
index f711a6a62a315964a339b03085d809079b0a2b6d..13bfb5a23352f91d603168945d54d614c351fe3f 100644 (file)
--- a/apt_p2p_Khashmir/khashmir.py
+++ b/apt_p2p_Khashmir/khashmir.py
@@ -288,7 +288,11 @@ class KhashmirBase(protocol.Factory):
         """Error occurred, fail node."""
         log.msg("action ping failed on %s/%s: %s" % (node.host, node.port, err.getErrorMessage()))
         self.stats.completedAction('ping', start)
         """Error occurred, fail node."""
         log.msg("action ping failed on %s/%s: %s" % (node.host, node.port, err.getErrorMessage()))
         self.stats.completedAction('ping', start)

+        
+        # Consume unhandled errors
+        self.pinging[node.id].addErrback(lambda ping_err: None)

         del self.pinging[node.id]
         del self.pinging[node.id]

+        

         self.nodeFailed(node)
         return err
         
         self.nodeFailed(node)
         return err