From 330f470992bd74079b4fb74fa87fdc7244f62365 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 21 Jun 2011 11:25:44 -0400
Subject: [PATCH] Very small alterations, switched from using start() to pass
 host/port, to just defining them up front in init. Doesn't make sense to set
 them in start because we can't start more than once any way. Also, unbroke
 binaries.

---
 bin/nova-ajax-console-proxy | 5 +++--
 bin/nova-direct-api         | 7 +++++--
 bin/nova-objectstore        | 7 +++++--
 bin/nova-vncproxy           | 7 +++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index d88f59e4..21cf6800 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -137,8 +137,9 @@ if __name__ == '__main__':
     utils.default_flagfile()
     FLAGS(sys.argv)
     logging.setup()
-    server = wsgi.Server()
+    acp_port = FLAGS.ajax_console_proxy_port
     acp = AjaxConsoleProxy()
     acp.register_listeners()
-    server.start(acp, FLAGS.ajax_console_proxy_port, host='0.0.0.0')
+    server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port)
+    server.start()
     server.wait()
diff --git a/bin/nova-direct-api b/bin/nova-direct-api
index 83ec7272..5d63eb87 100755
--- a/bin/nova-direct-api
+++ b/bin/nova-direct-api
@@ -93,6 +93,9 @@ if __name__ == '__main__':
     with_req = direct.PostParamsMiddleware(with_json)
     with_auth = direct.DelegatedAuthMiddleware(with_req)
 
-    server = wsgi.Server()
-    server.start(with_auth, FLAGS.direct_port, host=FLAGS.direct_host)
+    server = wsgi.Server("Direct API", 
+                         with_auth, 
+                         host=FLAGS.direct_host,
+                         port=FLAGS.direct_port)
+    server.start()
     server.wait()
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 6ef841b8..aa0dc063 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -50,6 +50,9 @@ if __name__ == '__main__':
     FLAGS(sys.argv)
     logging.setup()
     router = s3server.S3Application(FLAGS.buckets_path)
-    server = wsgi.Server()
-    server.start(router, FLAGS.s3_port, host=FLAGS.s3_host)
+    server = wsgi.Server("S3 Objectstore", 
+                         router, 
+                         port=FLAGS.s3_port, 
+                         host=FLAGS.s3_host)
+    server.start()
     server.wait()
diff --git a/bin/nova-vncproxy b/bin/nova-vncproxy
index ccb97e3a..62d3b948 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()