diff options
| author | Dan Wendlandt <dan@nicira.com> | 2011-09-07 14:27:06 -0700 |
|---|---|---|
| committer | Dan Wendlandt <dan@nicira.com> | 2011-09-07 14:27:06 -0700 |
| commit | 0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc (patch) | |
| tree | 0ee3f8a60147da042b0b14db350a320228876fa6 /bin/nova-ajax-console-proxy | |
| parent | e5e3b306985a3b1fdd8a971f48b76eaf8f923f21 (diff) | |
| parent | 3e0698e3b57c9f73a359340f51c2797d8adc669a (diff) | |
| download | nova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.tar.gz nova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.tar.xz nova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.zip | |
merge trunk
Diffstat (limited to 'bin/nova-ajax-console-proxy')
| -rwxr-xr-x | bin/nova-ajax-console-proxy | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy index 0a789b4b9..23fb42fb5 100755 --- a/bin/nova-ajax-console-proxy +++ b/bin/nova-ajax-console-proxy @@ -113,11 +113,10 @@ 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) + self.conn.create_consumer( + FLAGS.ajax_console_proxy_topic, + TopicProxy) def delete_expired_tokens(): now = time.time() @@ -129,7 +128,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 +141,4 @@ if __name__ == '__main__': server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port) service.serve(server) service.wait() + self.conn.close() |