Cherry-pick from release-0.3:

*Version bump to 0.3
 *Add delays before reconnect to RabbitMQ

Change-Id: Ia66eab17e0df5b41d7d60dc302c88e0ed08ff401
This commit is contained in:
Serg Melikyan 2013-10-10 10:13:45 +04:00 committed by Ekaterina Fedorova
parent 494bcc5211
commit 4c9c97b79b
3 changed files with 12 additions and 1 deletions

View File

@ -52,6 +52,7 @@ class TaskResultHandlerService(service.Service):
return MqClient(**connection_params)
def _handle_results(self):
reconnect_delay = 1
while True:
try:
with self._create_mq_client() as mqClient:
@ -59,6 +60,7 @@ class TaskResultHandlerService(service.Service):
enable_ha=True)
with mqClient.open(conf.results_queue,
prefetch_count=100) as results_sb:
reconnect_delay = 1
while True:
result = results_sb.get_message(timeout=1)
if result:
@ -66,7 +68,11 @@ class TaskResultHandlerService(service.Service):
except Exception as ex:
log.exception(ex)
eventlet.sleep(reconnect_delay)
reconnect_delay = min(reconnect_delay * 2, 60)
def _handle_reports(self):
reconnect_delay = 1
while True:
try:
with self._create_mq_client() as mqClient:
@ -74,6 +80,7 @@ class TaskResultHandlerService(service.Service):
enable_ha=True)
with mqClient.open(conf.reports_queue,
prefetch_count=100) as reports_sb:
reconnect_delay = 1
while True:
report = reports_sb.get_message(timeout=1)
if report:
@ -81,6 +88,9 @@ class TaskResultHandlerService(service.Service):
except Exception as ex:
log.exception(ex)
eventlet.sleep(reconnect_delay)
reconnect_delay = min(reconnect_delay * 2, 60)
@handle
def handle_result(message):

View File

@ -32,3 +32,4 @@ python-keystoneclient>=0.4.1
oslo.config>=1.2.0
# Please, revert to murano-common>=x.x.x before release
http://tarballs.openstack.org/murano-common/murano-common-master.tar.gz#egg=murano-common-0.4

View File

@ -15,7 +15,7 @@
[metadata]
name = murano-api
version = 0.2
version = 0.3
summary = Murano API
description-file =
README.rst