openstack/deb-python-kafka
Code Issues Proposed changes

Move Request / Response logging from KafkaClient to BrokerConnection

Browse Source 
and reenable kafka.conn debug logging in tests
This commit is contained in:
Dana Powers
2015-12-10 18:38:34 -08:00
parent 1cb732aba1
commit 8fff81468d
4 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kafka/client.py
View File

@@ -144,7 +144,6 @@ class KafkaClient(object):
response = conn.recv() response = conn.recv()
if response is not None: if response is not None:
decoded = decoder_fn(response) decoded = decoder_fn(response)
log.debug('Response %s: %s', correlation_id, decoded)
return decoded return decoded
raise KafkaUnavailableError('All servers failed to process request') raise KafkaUnavailableError('All servers failed to process request')
@@ -250,7 +249,6 @@ class KafkaClient(object):
'from server %s', correlation_id, broker) 'from server %s', correlation_id, broker)
continue continue
log.debug('Response %s: %s', correlation_id, response)
for payload_response in decoder_fn(response): for payload_response in decoder_fn(response):
topic_partition = (str(payload_response.topic), topic_partition = (str(payload_response.topic),
payload_response.partition) payload_response.partition)

6
kafka/conn.py
View File

@@ -75,11 +75,12 @@ class BrokerConnection(local):
self._write_fd.write(message) self._write_fd.write(message)
self._write_fd.flush() self._write_fd.flush()
except socket.error: except socket.error:
log.exception("Error in BrokerConnection.send()") log.exception("Error in BrokerConnection.send(): %s", request)
self.close() self.close()
return None return None
if expect_response: if expect_response:
self.in_flight_requests.append((self.correlation_id, request.RESPONSE_TYPE)) self.in_flight_requests.append((self.correlation_id, request.RESPONSE_TYPE))
log.debug('Request %d: %s', self.correlation_id, request)
return self.correlation_id return self.correlation_id
def recv(self, timeout=None): def recv(self, timeout=None):
@@ -100,9 +101,10 @@ class BrokerConnection(local):
raise RuntimeError('Correlation ids do not match!') raise RuntimeError('Correlation ids do not match!')
response = response_type.decode(self._read_fd) response = response_type.decode(self._read_fd)
except (RuntimeError, socket.error, struct.error): except (RuntimeError, socket.error, struct.error):
log.exception("Error in BrokerConnection.recv()") log.exception("Error in BrokerConnection.recv() for request %d", correlation_id)
self.close() self.close()
return None return None
log.debug('Response %d: %s', correlation_id, response)
return response return response
def next_correlation_id_recv(self): def next_correlation_id_recv(self):

18
test/test_conn.py
View File

@@ -1,4 +1,3 @@
import logging
import socket import socket
import struct import struct
from threading import Thread from threading import Thread
@@ -12,9 +11,6 @@ from kafka.conn import KafkaConnection, collect_hosts, DEFAULT_SOCKET_TIMEOUT_SE
class ConnTest(unittest.TestCase): class ConnTest(unittest.TestCase):
def setUp(self): def setUp(self):
# kafka.conn debug logging is verbose, so only enable in conn tests
logging.getLogger('kafka.conn').setLevel(logging.DEBUG)
self.config = { self.config = {
'host': 'localhost', 'host': 'localhost',
'port': 9090, 'port': 9090,
@@ -50,11 +46,6 @@ class ConnTest(unittest.TestCase):
# Reset any mock counts caused by __init__ # Reset any mock counts caused by __init__
self.MockCreateConn.reset_mock() self.MockCreateConn.reset_mock()
def tearDown(self):
# Return connection logging to INFO
logging.getLogger('kafka.conn').setLevel(logging.INFO)
def test_collect_hosts__happy_path(self): def test_collect_hosts__happy_path(self):
hosts = "localhost:1234,localhost" hosts = "localhost:1234,localhost"
results = collect_hosts(hosts) results = collect_hosts(hosts)
@@ -193,15 +184,6 @@ class ConnTest(unittest.TestCase):
class TestKafkaConnection(unittest.TestCase): class TestKafkaConnection(unittest.TestCase):
def setUp(self):
# kafka.conn debug logging is verbose, so only enable in conn tests
logging.getLogger('kafka.conn').setLevel(logging.DEBUG)
def tearDown(self):
# Return connection logging to INFO
logging.getLogger('kafka.conn').setLevel(logging.INFO)
@mock.patch('socket.create_connection') @mock.patch('socket.create_connection')
def test_copy(self, socket): def test_copy(self, socket):
"""KafkaConnection copies work as expected""" """KafkaConnection copies work as expected"""

3
test/testutil.py
View File

@@ -112,6 +112,3 @@ class Timer(object):
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
logging.getLogger('test.fixtures').setLevel(logging.ERROR) logging.getLogger('test.fixtures').setLevel(logging.ERROR)
logging.getLogger('test.service').setLevel(logging.ERROR) logging.getLogger('test.service').setLevel(logging.ERROR)
# kafka.conn debug logging is verbose, disable in tests by default
logging.getLogger('kafka.conn').setLevel(logging.INFO)