x/python-ganttclient
Code Issues Proposed changes

more progress

Browse Source
This commit is contained in:
Anthony Young
2011-03-23 02:33:11 -07:00
parent f3d7969263
commit c98b2efa95
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/nova-vnc-proxy
View File

@@ -37,9 +37,12 @@ from nova import flags
from nova import log as logging
from nova import utils
from nova import wsgi
from nova import version
from nova.vnc import auth
from nova.vnc import proxy
LOG = logging.getLogger('nova.vnc-proxy')
FLAGS = flags.FLAGS
flags.DEFINE_string('vnc_proxy_wwwroot', '/code/noVNC/vnclet/noVNC',
'Full path to noVNC directory')
@@ -58,13 +61,18 @@ if __name__ == "__main__":
FLAGS(sys.argv)
logging.setup()
LOG.audit(_("Starting nova-vnc-proxy node (version %s)"),
version.version_string_with_vcs())
app = proxy.WebsocketVNCProxy(FLAGS.vnc_proxy_wwwroot)
with_logging = auth.LoggingMiddleware(app)
if FLAGS.vnc_debug:
app = proxy.DebugMiddleware(app)
with_auth = proxy.DebugMiddleware(with_logging)
else:
app = auth.NovaAuthMiddleware(app)
with_auth = auth.NovaAuthMiddleware(with_logging)
server = wsgi.Server()
server.start(app, FLAGS.vnc_proxy_port, host=FLAGS.vnc_proxy_host)
server.start(with_auth, FLAGS.vnc_proxy_port, host=FLAGS.vnc_proxy_host)
server.wait()