diff options
| author | termie <github@anarkystic.com> | 2011-03-24 16:37:35 -0700 |
|---|---|---|
| committer | termie <github@anarkystic.com> | 2011-03-24 16:37:35 -0700 |
| commit | d7835f81c46d880d5ba8e67cdcdc9d0bc977f86e (patch) | |
| tree | 78a292baeb302da9afd11ef57b29578702422ab1 /bin | |
| parent | 47592e504cca5c4b36868412720ca1ff443de4d8 (diff) | |
port s3server to eventlet/wsgi
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-objectstore | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/bin/nova-objectstore b/bin/nova-objectstore index 94ef2a8d5..6ef841b85 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -36,9 +36,10 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): gettext.install('nova', unicode=1) from nova import flags +from nova import log as logging from nova import utils -from nova import twistd -from nova.objectstore import handler +from nova import wsgi +from nova.objectstore import s3server FLAGS = flags.FLAGS @@ -46,7 +47,9 @@ FLAGS = flags.FLAGS if __name__ == '__main__': utils.default_flagfile() - twistd.serve(__file__) - -if __name__ == '__builtin__': - application = handler.get_application() # pylint: disable=C0103 + 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.wait() |