aboutsummaryrefslogtreecommitdiff
path: root/lib/chutney/Testing.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chutney/Testing.py')
-rw-r--r--lib/chutney/Testing.py23
1 files changed, 22 insertions, 1 deletions
diff --git a/lib/chutney/Testing.py b/lib/chutney/Testing.py
index ad69b52..ee1e62b 100644
--- a/lib/chutney/Testing.py
+++ b/lib/chutney/Testing.py
@@ -46,7 +46,7 @@ def track_introduction_points(node):
node_intro_events[nodenum].put(("added", fingerprint))
- prefix = "rend_services_introduce(): Giving up on "
+ """prefix = "rend_services_introduce(): Giving up on "
if logevent.message.startswith(prefix) or "Giving up on" in logevent.message:
fingerprint = logevent.message[len(prefix):].split(" ")[0][1:41]
@@ -68,7 +68,28 @@ def track_introduction_points(node):
logging.info("%s: removed %s (%s)" % (nodenick, removed_intro_node._env["nick"], fingerprint))
node_intro_events[nodenum].put(("removed", fingerprint))
+ del node_intro_circuits[nodenum][circuit]"""
+ prefix = "rend_services_introduce(): Circuit to "
+ if logevent.message.startswith(prefix) and "disapeared" in logevent.message:
+ fingerprint = logevent.message[len(prefix):].split(" ")[0][1:41]
+
+ for_deletion = []
+
+ for circuit, fp in node_intro_circuits[nodenum].iteritems():
+ #log("circuit " + str(circuit) + " fp " + str(fp))
+ if fingerprint == fp:
+ for_deletion.append(circuit)
+
+ for circuit in for_deletion:
+ fingerprint = node_intro_circuits[nodenum][circuit]
+
+ removed_intro_node = nodes_by_fingerprint[fingerprint]
+
+ logging.info("%s: removed %s (%s)" % (nodenick, removed_intro_node._env["nick"], fingerprint))
+
+ node_intro_events[nodenum].put(("removed", fingerprint))
del node_intro_circuits[nodenum][circuit]
+
logging.debug(nodenick + ": " + logevent.message)