stackforge-attic/murano-common
Code Issues Proposed changes

bug-fixes in messaging

Browse Source
This commit is contained in:
Stan Lagun 2013-07-27 22:59:48 +04:00
parent e3ed6868f4
commit 6d6c29f7b5
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
muranocommon/messaging/mqclient.py
View File

@ -50,12 +50,13 @@ class MqClient(object):
def connect(self): def connect(self):
if not self._connected: if not self._connected:
promise = self._client.connect() promise = self._client.connect()
self._client.wait(promise, timeout=10000) if self._client.wait(promise, timeout=10) is not None:
self._connected = True self._connected = True
def close(self): def close(self):
if self._connected: if self._connected:
self._client.close() promise = self._client.close()
self._client.wait(promise)
self._connected = False self._connected = False
def declare(self, queue, exchange=None): def declare(self, queue, exchange=None):

2
muranocommon/messaging/subscription.py
View File

@ -39,5 +39,7 @@ class Subscription(object):
raise RuntimeError( raise RuntimeError(
"Subscription object must be used within 'with' block") "Subscription object must be used within 'with' block")
msg_handle = self._client.wait(self._promise, timeout=timeout) msg_handle = self._client.wait(self._promise, timeout=timeout)
if msg_handle is None:
return None
msg = Message(self._client, msg_handle) msg = Message(self._client, msg_handle)
return msg return msg

2
requirements.txt
View File

@ -2,4 +2,4 @@ d2to1>=0.2.10,<0.3
pbr>=0.5,<0.6 pbr>=0.5,<0.6
anyjson anyjson
eventlet>=0.9.12 eventlet>=0.9.12
https://github.com/istalker2/puka/releases/download/1.0.7b/puka-1.0.7b.tar.gz#egg=puka-1.0.7b https://github.com/istalker2/puka/releases/download/1.0.7c/puka-1.0.7c.tar.gz#egg=puka-1.0.7c