summaryrefslogtreecommitdiffstats
path: root/bin/nova-vncproxy
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-06-29 15:09:29 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-06-29 15:09:29 +0000
commit9476c540b2bbdb3ce77cd0acb68639f1f5ed2f72 (patch)
treeb03261d365790209cb68565ed3b2388f0cd1edbe /bin/nova-vncproxy
parentc16f97249e4f0626f8b8d4a7af070201641770b8 (diff)
parent4a3ef4367db23e8495e9c1dc4a49b5c66a6c763e (diff)
Merge with trunk
Diffstat (limited to 'bin/nova-vncproxy')
-rwxr-xr-xbin/nova-vncproxy7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/nova-vncproxy b/bin/nova-vncproxy
index ccb97e3a3..72271df3a 100755
--- a/bin/nova-vncproxy
+++ b/bin/nova-vncproxy
@@ -96,6 +96,9 @@ if __name__ == "__main__":
service.serve()
- server = wsgi.Server()
- server.start(with_auth, FLAGS.vncproxy_port, host=FLAGS.vncproxy_host)
+ server = wsgi.Server("VNC Proxy",
+ with_auth,
+ host=FLAGS.vncproxy_host,
+ port=FLAGS.vncproxy_port)
+ server.start()
server.wait()