openstack/oslo.cache
Code Issues Proposed changes

Move some of these noisy logs to trace level

Browse Source 
Change-Id: I824175e70b7c3b1aec8d579d0f2cebefaee5b771
This commit is contained in:
Joshua Harlow 2016-02-05 09:09:11 -08:00
parent 8898a94361
commit 2a3a239496
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
oslo_cache/_memcache_pool.py
View File

@ -108,16 +108,22 @@ class ConnectionPool(queue.Queue):
""" """
raise NotImplementedError raise NotImplementedError
def _debug_logger(self, msg, *args, **kwargs): def _do_log(self, level, msg, *args, **kwargs):
if LOG.isEnabledFor(logging.DEBUG): if LOG.isEnabledFor(level):
thread_id = threading.current_thread().ident thread_id = threading.current_thread().ident
args = (id(self), thread_id) + args args = (id(self), thread_id) + args
prefix = 'Memcached pool %s, thread %s: ' prefix = 'Memcached pool %s, thread %s: '
LOG.debug(prefix + msg, *args, **kwargs) LOG.log(level, prefix + msg, *args, **kwargs)
def _debug_logger(self, msg, *args, **kwargs):
self._do_log(logging.DEBUG, msg, *args, **kwargs)
def _trace_logger(self, msg, *args, **kwargs):
self._do_log(log.TRACE, msg, *args, **kwargs)
@contextlib.contextmanager @contextlib.contextmanager
def acquire(self): def acquire(self):
self._debug_logger('Acquiring connection') self._trace_logger('Acquiring connection')
try: try:
conn = self.get(timeout=self._connection_get_timeout) conn = self.get(timeout=self._connection_get_timeout)
except queue.Empty: except queue.Empty:
@ -125,18 +131,18 @@ class ConnectionPool(queue.Queue):
_('Unable to get a connection from pool id %(id)s after ' _('Unable to get a connection from pool id %(id)s after '
'%(seconds)s seconds.') % '%(seconds)s seconds.') %
{'id': id(self), 'seconds': self._connection_get_timeout}) {'id': id(self), 'seconds': self._connection_get_timeout})
self._debug_logger('Acquired connection %s', id(conn)) self._trace_logger('Acquired connection %s', id(conn))
try: try:
yield conn yield conn
finally: finally:
self._debug_logger('Releasing connection %s', id(conn)) self._trace_logger('Releasing connection %s', id(conn))
self._drop_expired_connections() self._drop_expired_connections()
try: try:
# super() cannot be used here because Queue in stdlib is an # super() cannot be used here because Queue in stdlib is an
# old-style class # old-style class
queue.Queue.put(self, conn, block=False) queue.Queue.put(self, conn, block=False)
except queue.Full: except queue.Full:
self._debug_logger('Reaping exceeding connection %s', id(conn)) self._trace_logger('Reaping exceeding connection %s', id(conn))
self._destroy_connection(conn) self._destroy_connection(conn)
def _qsize(self): def _qsize(self):
@ -166,7 +172,7 @@ class ConnectionPool(queue.Queue):
now = time.time() now = time.time()
while self.queue and self.queue[0].ttl < now: while self.queue and self.queue[0].ttl < now:
conn = self.queue.popleft().connection conn = self.queue.popleft().connection
self._debug_logger('Reaping connection %s', id(conn)) self._trace_logger('Reaping connection %s', id(conn))
self._destroy_connection(conn) self._destroy_connection(conn)
def _put(self, conn): def _put(self, conn):