summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-08-28 18:18:40 -0700
committerChris Behrens <cbehrens@codestud.com>2011-08-28 18:18:40 -0700
commite5310d666f167efe6e3c9f97176d13801489fdfd (patch)
tree0c19a96fc6585f7ec4291576b673d14cc968bce2 /bin
parent32943729861ba4ad562e899a55af77b7974af8db (diff)
downloadnova-e5310d666f167efe6e3c9f97176d13801489fdfd.tar.gz
nova-e5310d666f167efe6e3c9f97176d13801489fdfd.tar.xz
nova-e5310d666f167efe6e3c9f97176d13801489fdfd.zip
fix nova-ajax-console-proxy
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-ajax-console-proxy13
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index 0a789b4b9..b3205ec56 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -113,11 +113,11 @@ class AjaxConsoleProxy(object):
AjaxConsoleProxy.tokens[kwargs['token']] = \
{'args': kwargs, 'last_activity': time.time()}
- conn = rpc.create_connection(new=True)
- consumer = rpc.create_consumer(
- conn,
- FLAGS.ajax_console_proxy_topic,
- TopicProxy)
+ self.conn = rpc.create_connection(new=True)
+ rpc.create_consumer(
+ self.conn,
+ FLAGS.ajax_console_proxy_topic,
+ TopicProxy)
def delete_expired_tokens():
now = time.time()
@@ -129,7 +129,7 @@ class AjaxConsoleProxy(object):
for k in to_delete:
del AjaxConsoleProxy.tokens[k]
- utils.LoopingCall(consumer.fetch, enable_callbacks=True).start(0.1)
+ self.conn.consume_in_thread()
utils.LoopingCall(delete_expired_tokens).start(1)
if __name__ == '__main__':
@@ -142,3 +142,4 @@ if __name__ == '__main__':
server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port)
service.serve(server)
service.wait()
+ self.conn.close()