diff options
-rwxr-xr-x | bin/nova-vnc-proxy | 18 | ||||
-rw-r--r-- | nova/vnc/proxy.py | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/bin/nova-vnc-proxy b/bin/nova-vnc-proxy index 52e966090..5891652c4 100755 --- a/bin/nova-vnc-proxy +++ b/bin/nova-vnc-proxy @@ -61,18 +61,10 @@ if __name__ == "__main__": app = proxy.WebsocketVNCProxy(FLAGS.vnc_proxy_wwwroot) if FLAGS.vnc_debug: - app = proxy.DebugMiddleware(app.serve) + app = proxy.DebugMiddleware(app) else: - app = auth.NovaAuthMiddleware(app.serve) + app = auth.NovaAuthMiddleware(app) - - listener = eventlet.listen((FLAGS.vnc_proxy_host, FLAGS.vnc_proxy_port)) - - - from eventlet import wsgi - wsgi.server(listener, app, max_size=1000) - - -# server = wsgi.Server() -# server.start(app, FLAGS.vnc_proxy_port, host=FLAGS.vnc_proxy_host) -# server.wait() + server = wsgi.Server() + server.start(app, FLAGS.vnc_proxy_port, host=FLAGS.vnc_proxy_host) + server.wait() diff --git a/nova/vnc/proxy.py b/nova/vnc/proxy.py index 3f218e744..5dc83fcb1 100644 --- a/nova/vnc/proxy.py +++ b/nova/vnc/proxy.py @@ -70,7 +70,7 @@ class WebsocketVNCProxy(object): t2.wait() _handle(environ, start_response) - def serve(self, environ, start_response): + def __call__(self, environ, start_response): req = Request(environ) if req.path == '/data': return self.proxy_connection(environ, start_response) |