From 4880de94e814e9d379277eaee6c9752c6d00684c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 10 Oct 2013 14:17:08 -0400 Subject: [PATCH] -Have master console multiplexer not crash because a handler would have crashed -Have sockapi remove console session handler on client disconnect --- confluent/console.py | 5 ++++- confluent/sockapi.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/confluent/console.py b/confluent/console.py index 9b0e8951..b0d53a6e 100644 --- a/confluent/console.py +++ b/confluent/console.py @@ -53,7 +53,10 @@ class _ConsoleHandler(object): #and shrink buffer self.flushbuffer() for rcpt in self.rcpts.itervalues(): - rcpt(data) + try: + rcpt(data) + except: + pass def get_recent(self): """Retrieve 'recent' data diff --git a/confluent/sockapi.py b/confluent/sockapi.py index 5c3bc534..0411ae3c 100644 --- a/confluent/sockapi.py +++ b/confluent/sockapi.py @@ -3,6 +3,7 @@ # This is the socket api layer. # It implement unix and tls sockets +# # TODO: SO_PEERCRED for unix socket import confluent.console as console import confluent.config as config @@ -19,6 +20,7 @@ def sessionhdl(connection): while (1): data = connection.read() if not data: + consession.destroy() return consession.write(data)