openstack
/
deb-python-pika-pool
Code Issues Proposed changes

str fairy

This commit is contained in:
bninja 2014-09-04 16:21:53 -07:00
parent 76a3d9ea3d
commit 7790ef12e4
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pika_pool.py
View File

@ -49,6 +49,7 @@ Use it like e.g. this:
"""
from __future__ import unicode_literals
from datetime import datetime
import logging
import Queue as queue
import select
@ -213,16 +214,22 @@ class Pool(object):
if self.channel:
try:
self.channel.close()
self.channel = None
except Connection.connectivity_errors as ex:
if not Connection.is_connection_invalidated(ex):
raise
self.channel = None
try:
self.cxn.close()
except Connection.connectivity_errors as ex:
if not Connection.is_connection_invalidated(ex):
raise
def __str__(self):
return ', '.join('{0}={1}'.format(k, v) for k, v in [
('cxn', '{0}:{1}/{2}'.format(self.cxn.params.host, self.cxn.params.port, self.cxn.params.virtual_host)),
('channel', '{0}'.format(int(self.channel) if self.channel is not None else self.channel)),
])
def _create(self):
"""
All fairy creates go through here.
@ -300,11 +307,11 @@ class QueuedPool(Pool):
except Overflow:
raise Timeout()
if self.is_expired(fairy):
logger.info('connection %r expired', fairy)
logger.info('closing expired connection - %s', fairy)
self.close(fairy)
return self.acquire(timeout=timeout)
if self.is_stale(fairy):
logger.info('connection %r stale', fairy)
logger.info('closing stale connection - %s', fairy)
self.close(fairy)
return self.acquire(timeout=timeout)
return self.Connection(self, fairy)
@ -342,6 +349,14 @@ class QueuedPool(Pool):
super(QueuedPool.Fairy, self).__init__(cxn)
self.released_at = self.created_at = time.time()
def __str__(self):
return ', '.join('{0}={1}'.format(k, v) for k, v in [
('cxn', '{0}:{1}/{2}'.format(self.cxn.params.host, self.cxn.params.port, self.cxn.params.virtual_host)),
('channel', '{0}'.format(int(self.channel) if self.channel is not None else self.channel)),
('created_at', '{0}'.format(datetime.fromtimestamp(self.created_at).isoformat())),
('released_at', '{0}'.format(datetime.fromtimestamp(self.released_at).isoformat())),
])
def is_stale(self, fairy):
if not self.stale:
return False