diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-29 16:13:09 -0700 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-29 16:13:09 -0700 |
| commit | 620c2dabfa8d92dbf250c078dda71d3ec11c6d8c (patch) | |
| tree | 213c6cb9bfebdde86310a5891874487a5cfe4b35 | |
| parent | c7555d66e5ba4bf1f4eae2edcdedfcb7ffa2d732 (diff) | |
| download | nova-620c2dabfa8d92dbf250c078dda71d3ec11c6d8c.tar.gz nova-620c2dabfa8d92dbf250c078dda71d3ec11c6d8c.tar.xz nova-620c2dabfa8d92dbf250c078dda71d3ec11c6d8c.zip | |
fix for lp742650
| -rwxr-xr-x | bin/nova-ajax-console-proxy | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy index 0342c620a..d88f59e40 100755 --- a/bin/nova-ajax-console-proxy +++ b/bin/nova-ajax-console-proxy @@ -108,17 +108,17 @@ class AjaxConsoleProxy(object): return "Server Error" def register_listeners(self): - class Callback: - def __call__(self, data, message): - if data['method'] == 'authorize_ajax_console': - AjaxConsoleProxy.tokens[data['args']['token']] = \ - {'args': data['args'], 'last_activity': time.time()} + class TopicProxy(): + @staticmethod + def authorize_ajax_console(context, **kwargs): + AjaxConsoleProxy.tokens[kwargs['token']] = \ + {'args': kwargs, 'last_activity': time.time()} conn = rpc.Connection.instance(new=True) consumer = rpc.TopicAdapterConsumer( - connection=conn, - topic=FLAGS.ajax_console_proxy_topic) - consumer.register_callback(Callback()) + connection=conn, + proxy=TopicProxy, + topic=FLAGS.ajax_console_proxy_topic) def delete_expired_tokens(): now = time.time() @@ -130,8 +130,7 @@ class AjaxConsoleProxy(object): for k in to_delete: del AjaxConsoleProxy.tokens[k] - utils.LoopingCall(consumer.fetch, auto_ack=True, - enable_callbacks=True).start(0.1) + utils.LoopingCall(consumer.fetch, enable_callbacks=True).start(0.1) utils.LoopingCall(delete_expired_tokens).start(1) if __name__ == '__main__': |
