x/gantt
Code Issues Proposed changes

port s3server to eventlet/wsgi

Browse Source
This commit is contained in:
termie
2011-03-24 16:37:35 -07:00
parent d68f8a2545
commit 1bdd9e1ff3
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/nova-objectstore
View File

@@ -36,9 +36,10 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
gettext.install('nova', unicode=1) gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging
from nova import utils from nova import utils
from nova import twistd from nova import wsgi
from nova.objectstore import handler from nova.objectstore import s3server
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
@@ -46,7 +47,9 @@ FLAGS = flags.FLAGS
if __name__ == '__main__': if __name__ == '__main__':
utils.default_flagfile() utils.default_flagfile()
twistd.serve(__file__) FLAGS(sys.argv)
logging.setup()
if __name__ == '__builtin__': router = s3server.S3Application(FLAGS.buckets_path)
application = handler.get_application() # pylint: disable=C0103 server = wsgi.Server()
server.start(router, FLAGS.s3_port, host=FLAGS.s3_host)
server.wait()