x/python-ganttclient
Code Issues Proposed changes

Don't leak RPC connections on timeouts or other exceptions

Browse Source 
Fixes bug 968843

Change-Id: I9e0f1e306cab203bf4c865050b7a45f96127062e
This commit is contained in:
Chris Behrens
2012-04-25 17:34:53 +00:00
parent e6b41e175e
commit 08b01a5901
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/rpc/amqp.py
View File

@@ -38,6 +38,7 @@ from nova import flags
from nova import log as logging from nova import log as logging
from nova.openstack.common import local from nova.openstack.common import local
import nova.rpc.common as rpc_common import nova.rpc.common as rpc_common
from nova import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -293,7 +294,11 @@ class MulticallWaiter(object):
if self._done: if self._done:
raise StopIteration raise StopIteration
while True: while True:
try:
self._iterator.next() self._iterator.next()
except Exception:
with utils.save_and_reraise_exception():
self.done()
if self._got_ending: if self._got_ending:
self.done() self.done()
raise StopIteration raise StopIteration