summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2011-03-23 02:33:11 -0700
committerAnthony Young <sleepsonthefloor@gmail.com>2011-03-23 02:33:11 -0700
commit5cdf8f63fb2dbccea0152d17f00bf80352f8fa1a (patch)
tree4d83693f3c6747711da5d4532c24e7d6c0e818f0 /bin
parente2f085eae874012784e53416f6e6213dcfde4859 (diff)
downloadnova-5cdf8f63fb2dbccea0152d17f00bf80352f8fa1a.tar.gz
nova-5cdf8f63fb2dbccea0152d17f00bf80352f8fa1a.tar.xz
nova-5cdf8f63fb2dbccea0152d17f00bf80352f8fa1a.zip
more progress
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-vnc-proxy14
1 files changed, 11 insertions, 3 deletions
diff --git a/bin/nova-vnc-proxy b/bin/nova-vnc-proxy
index 5891652c4..838c871d0 100755
--- a/bin/nova-vnc-proxy
+++ b/bin/nova-vnc-proxy
@@ -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()