From 90c5b48c96d7d34fbc446660449892f3bd3b9040 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 9 Mar 2015 12:06:38 +0100 Subject: vici: Catch Python GeneratorExit to properly cancel streamed event iteration --- src/libcharon/plugins/vici/python/vici/session.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/libcharon/plugins/vici/python') diff --git a/src/libcharon/plugins/vici/python/vici/session.py b/src/libcharon/plugins/vici/python/vici/session.py index 65b89b5ba..da79ecd64 100644 --- a/src/libcharon/plugins/vici/python/vici/session.py +++ b/src/libcharon/plugins/vici/python/vici/session.py @@ -281,10 +281,16 @@ class SessionHandler(object): # issue command, and read any event messages packet = Packet.request(command, message) self.transport.send(packet) + exited = False while True: response = Packet.parse(self.transport.receive()) if response.response_type == Packet.EVENT: - yield Message.deserialize(response.payload) + if not exited: + try: + yield Message.deserialize(response.payload) + except GeneratorExit: + exited = True + pass else: break -- cgit v1.3