x/gantt
Code Issues Proposed changes

fix nova-ajax-console-proxy

Browse Source
This commit is contained in:
Chris Behrens
2011-08-28 18:18:40 -07:00
parent 7bfe3aabc2
commit eaed4bd9f7
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/nova-ajax-console-proxy
View File

@@ -113,11 +113,11 @@ class AjaxConsoleProxy(object):
AjaxConsoleProxy.tokens[kwargs['token']] = \ AjaxConsoleProxy.tokens[kwargs['token']] = \
{'args': kwargs, 'last_activity': time.time()} {'args': kwargs, 'last_activity': time.time()}
conn = rpc.create_connection(new=True) self.conn = rpc.create_connection(new=True)
consumer = rpc.create_consumer( rpc.create_consumer(
conn, self.conn,
FLAGS.ajax_console_proxy_topic, FLAGS.ajax_console_proxy_topic,
TopicProxy) TopicProxy)
def delete_expired_tokens(): def delete_expired_tokens():
now = time.time() now = time.time()
@@ -129,7 +129,7 @@ class AjaxConsoleProxy(object):
for k in to_delete: for k in to_delete:
del AjaxConsoleProxy.tokens[k] 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) utils.LoopingCall(delete_expired_tokens).start(1)
if __name__ == '__main__': if __name__ == '__main__':
@@ -142,3 +142,4 @@ if __name__ == '__main__':
server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port) server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port)
service.serve(server) service.serve(server)
service.wait() service.wait()
self.conn.close()