From 1a94f1baba0e324f208a1132efb42a6ac3b8518c Mon Sep 17 00:00:00 2001 From: Tyler Hobbs Date: Thu, 16 Jan 2014 11:45:05 -0600 Subject: [PATCH] Don't error log ConnectionExceptions during handshake --- cassandra/connection.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cassandra/connection.py b/cassandra/connection.py index 22d4fd01..1ebb5238 100644 --- a/cassandra/connection.py +++ b/cassandra/connection.py @@ -220,8 +220,14 @@ class Connection(object): return if not isinstance(options_response, SupportedMessage): - log.error("Did not get expected SupportedMessage response; instead, got: %s", options_response) - raise ConnectionException("Did not get expected SupportedMessage response; instead, got: %s" % (options_response,)) + if isinstance(options_response, ConnectionException): + raise options_response + else: + log.error("Did not get expected SupportedMessage response; " \ + "instead, got: %s", options_response) + raise ConnectionException("Did not get expected SupportedMessage " \ + "response; instead, got: %s" \ + % (options_response,)) log.debug("Received options response on new connection (%s) from %s", id(self), self.host)