diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-02-25 01:31:02 +0000 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-02-25 01:31:02 +0000 |
| commit | c8345c9ebc0357f1fe06ac520f286f036cb0596c (patch) | |
| tree | 197e6c852db619cf03800a77585637d8671d3d71 /bin/nova-ajax-console-proxy | |
| parent | 05d135be0c0d8a90a97d62005a101345964800cf (diff) | |
| parent | c8b630a78e955756e77be8879c1da863a5357ea0 (diff) | |
| download | nova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.tar.gz nova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.tar.xz nova-c8345c9ebc0357f1fe06ac520f286f036cb0596c.zip | |
Merging trunk, small fixes
Diffstat (limited to 'bin/nova-ajax-console-proxy')
| -rwxr-xr-x | bin/nova-ajax-console-proxy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy index 2bc407658..1e11c6d58 100755 --- a/bin/nova-ajax-console-proxy +++ b/bin/nova-ajax-console-proxy @@ -25,7 +25,6 @@ from eventlet.green import urllib2 import exceptions import gettext -import logging import os import sys import time @@ -48,9 +47,11 @@ from nova import utils from nova import wsgi FLAGS = flags.FLAGS - flags.DEFINE_integer('ajax_console_idle_timeout', 300, 'Seconds before idle connection destroyed') +flags.DEFINE_flag(flags.HelpFlag()) +flags.DEFINE_flag(flags.HelpshortFlag()) +flags.DEFINE_flag(flags.HelpXMLFlag()) LOG = logging.getLogger('nova.ajax_console_proxy') LOG.setLevel(logging.DEBUG) @@ -130,6 +131,7 @@ class AjaxConsoleProxy(object): if __name__ == '__main__': utils.default_flagfile() FLAGS(sys.argv) + logging.setup() server = wsgi.Server() acp = AjaxConsoleProxy() acp.register_listeners() |