diff options
| author | Todd Willey <todd@ansolabs.com> | 2010-11-04 14:20:15 -0400 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2010-11-04 14:20:15 -0400 |
| commit | 95b041ef2ea3dc101312bbb7e1683dfd75f5f80e (patch) | |
| tree | 12801c64cd627a5f5a82602c88d3686f266d6780 /nova/rpc.py | |
| parent | d14dafebf80cfc1776be5496b44a1970167114d8 (diff) | |
| parent | 671b712a5ad9034fa89761018203cc7c1ea0449b (diff) | |
| download | nova-95b041ef2ea3dc101312bbb7e1683dfd75f5f80e.tar.gz nova-95b041ef2ea3dc101312bbb7e1683dfd75f5f80e.tar.xz nova-95b041ef2ea3dc101312bbb7e1683dfd75f5f80e.zip | |
merge trunk
Diffstat (limited to 'nova/rpc.py')
| -rw-r--r-- | nova/rpc.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/rpc.py b/nova/rpc.py index 895820cd0..ea36d69f4 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -206,6 +206,7 @@ class DirectConsumer(Consumer): self.routing_key = msg_id self.exchange = msg_id self.auto_delete = True + self.exclusive = True super(DirectConsumer, self).__init__(connection=connection) @@ -262,6 +263,9 @@ def _unpack_context(msg): """Unpack context from msg.""" context_dict = {} for key in list(msg.keys()): + # NOTE(vish): Some versions of python don't like unicode keys + # in kwargs. + key = str(key) if key.startswith('_context_'): value = msg.pop(key) context_dict[key[9:]] = value |