summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandell Degerness <mdegerne@gmail.com>2011-08-04 20:52:34 +0000
committerTarmac <>2011-08-04 20:52:34 +0000
commit848b10a7fbc1da9d1d6615e56f3aa212f366ca3d (patch)
tree4b42868bd96e06e1272c6ec972c377b723a5ebe8
parent6cb5d4d7fdf4731112cefbe6f13794b081a82c5f (diff)
parentca79470843ff351623d07378ab553b2548cb8dc0 (diff)
downloadnova-848b10a7fbc1da9d1d6615e56f3aa212f366ca3d.tar.gz
nova-848b10a7fbc1da9d1d6615e56f3aa212f366ca3d.tar.xz
nova-848b10a7fbc1da9d1d6615e56f3aa212f366ca3d.zip
This updates nova-ajax-console-proxy to correctly use the new syntax introduced last week by Zed Shaw <zedshaw@zedshaw.com>.
rpc.Connection -> rpc.create_connection rpc.TopicAdapterConsumer -> rpc.create_consumer
-rw-r--r--Authors1
-rwxr-xr-xbin/nova-ajax-console-proxy10
2 files changed, 6 insertions, 5 deletions
diff --git a/Authors b/Authors
index 0e5931462..b216873df 100644
--- a/Authors
+++ b/Authors
@@ -64,6 +64,7 @@ Kirill Shileev <kshileev@gmail.com>
Koji Iida <iida.koji@lab.ntt.co.jp>
Lorin Hochstein <lorin@isi.edu>
Lvov Maxim <usrleon@gmail.com>
+Mandell Degerness <mdegerne@gmail.com>
Mark Washenberger <mark.washenberger@rackspace.com>
Masanori Itoh <itoumsn@nttdata.co.jp>
Matt Dietz <matt.dietz@rackspace.com>
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index 21cf68007..2329581a2 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -114,11 +114,11 @@ class AjaxConsoleProxy(object):
AjaxConsoleProxy.tokens[kwargs['token']] = \
{'args': kwargs, 'last_activity': time.time()}
- conn = rpc.Connection.instance(new=True)
- consumer = rpc.TopicAdapterConsumer(
- connection=conn,
- proxy=TopicProxy,
- topic=FLAGS.ajax_console_proxy_topic)
+ conn = rpc.create_connection(new=True)
+ consumer = rpc.create_consumer(
+ conn,
+ FLAGS.ajax_console_proxy_topic,
+ TopicProxy)
def delete_expired_tokens():
now = time.time()