From 9e023095e303f096ac0d2914ed427d2a37d1444d Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Sat, 17 Jul 2010 23:00:53 -0700
Subject: Replace nova-objectstore with a twistd style wrapper. Add a
 get_application method to objectstore handler.

---
 bin/nova-objectstore | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 7876864c0..5ac911f09 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -18,35 +18,32 @@
 #    under the License.
 
 """
-  Tornado daemon for nova objectstore. Supports S3 API.  
+  Twisted daemon for nova objectstore. Supports S3 API.
 """
 
 import logging
 
-from nova import vendor 
-from tornado import httpserver
-from tornado import ioloop
-
 from nova import flags
-from nova import server
 from nova import utils
-from nova.auth import users
+from nova import twistd
 from nova.objectstore import handler
 
 
 FLAGS = flags.FLAGS
 
 
-def main(argv):
+def main():
     # FIXME: if this log statement isn't here, no logging
     # appears from other files and app won't start daemonized
     logging.debug('Started HTTP server on %s' % (FLAGS.s3_internal_port))
-    app = handler.Application(users.UserManager())
-    server = httpserver.HTTPServer(app)
-    server.listen(FLAGS.s3_internal_port)
-    ioloop.IOLoop.instance().start()
-
+    app = handler.get_application()
+    print app
+    return app
 
+# NOTE(soren): Stolen from nova-compute
 if __name__ == '__main__':
+    twistd.serve(__file__)
+
+if __name__ == '__builtin__':
     utils.default_flagfile()
-    server.serve('nova-objectstore', main)
+    application = main()
-- 
cgit 


From 2d5124c3f2c6e4e78dc09eb8f38cb125641b9b1c Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Sat, 17 Jul 2010 23:04:46 -0700
Subject: Remove s3_internal_port setting. Objectstore should be able to handle
 the beatings now. As such, nginx is no longer needed, so it's removed from
 the dependencies and the configuration files are removed.

---
 bin/nova-objectstore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 5ac911f09..9385fd299 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -35,7 +35,7 @@ FLAGS = flags.FLAGS
 def main():
     # FIXME: if this log statement isn't here, no logging
     # appears from other files and app won't start daemonized
-    logging.debug('Started HTTP server on %s' % (FLAGS.s3_internal_port))
+    logging.debug('Started HTTP server on %s' % (FLAGS.s3_port))
     app = handler.get_application()
     print app
     return app
-- 
cgit