projects
/
quix0rs-apt-p2p.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5fb9db5
)
Don't try and add ourself to the routing table during an action.
author
Cameron Dale
<camrdale@gmail.com>
Tue, 29 Apr 2008 00:36:30 +0000
(17:36 -0700)
committer
Cameron Dale
<camrdale@gmail.com>
Tue, 29 Apr 2008 00:36:30 +0000
(17:36 -0700)
apt_p2p_Khashmir/actions.py
patch
|
blob
|
history
diff --git
a/apt_p2p_Khashmir/actions.py
b/apt_p2p_Khashmir/actions.py
index fc8746cc86b2d572d5a49e11aed79a2266eeb1ff..2d389b41a7b8c65b108eeb7986414b41dbe749e2 100644
(file)
--- a/
apt_p2p_Khashmir/actions.py
+++ b/
apt_p2p_Khashmir/actions.py
@@
-184,7
+184,8
@@
class ActionBase:
def gotResponse(self, dict, node, expected_results, df):
"""Receive a response from a remote node."""
def gotResponse(self, dict, node, expected_results, df):
"""Receive a response from a remote node."""
- reactor.callLater(0, self.caller.insertNode, node)
+ if node.id != self.caller.node.id:
+ reactor.callLater(0, self.caller.insertNode, node)
if self.finished or self.answered.has_key(node.id):
# a day late and a dollar short
return
if self.finished or self.answered.has_key(node.id):
# a day late and a dollar short
return
@@
-197,7
+198,8
@@
class ActionBase:
def actionFailed(self, err, node, expected_results, df):
"""Receive an error from a remote node."""
log.msg("action %s failed on %s/%s: %s" % (self.action, node.host, node.port, err.getErrorMessage()))
def actionFailed(self, err, node, expected_results, df):
"""Receive an error from a remote node."""
log.msg("action %s failed on %s/%s: %s" % (self.action, node.host, node.port, err.getErrorMessage()))
- self.caller.table.nodeFailed(node)
+ if node.id != self.caller.node.id:
+ self.caller.table.nodeFailed(node)
self.outstanding -= 1
self.outstanding_results -= expected_results
self.schedule()
self.outstanding -= 1
self.outstanding_results -= expected_results
self.schedule()