diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2013-05-19 09:36:16 -0500 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2013-05-21 23:36:52 -0400 |
| commit | f9865a57725e316606f00d42fcadc32ea7d61d31 (patch) | |
| tree | 2d76df9c432371db6d59127c7009acc03f6cae14 /bin | |
| parent | 6d776b779df29905505b2a27eb1bc1f832eaf0a3 (diff) | |
| download | keystone-f9865a57725e316606f00d42fcadc32ea7d61d31.tar.gz keystone-f9865a57725e316606f00d42fcadc32ea7d61d31.tar.xz keystone-f9865a57725e316606f00d42fcadc32ea7d61d31.zip | |
Consolidate eventlet code
This change consolidates eventlet code to a single module.
Importing eventlet drags along alot of other behavior changes
(such as replacing gettaddr with a version that doesn't support
IPv6), so it's safer if all the eventlet code is in one place so
it doesn't get imported when it's not needed, such as when
running under httpd.
blueprint extract-eventlet
Part of fix for bug 1178732
Change-Id: Ia557f8df7f856d7707a9d8c19800ddc36f1572ed
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/keystone-all | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index 2fdc8c7a..ff3143bd 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -2,7 +2,6 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 import greenlet -import eventlet import logging import os import signal @@ -23,6 +22,7 @@ from paste import deploy from keystone import config from keystone.common import wsgi +from keystone.common import wsgi_server from keystone.common import utils from keystone.openstack.common import importutils from keystone.openstack.common import version @@ -33,7 +33,7 @@ CONF = config.CONF def create_server(conf, name, host, port): app = deploy.loadapp('config:%s' % conf, name=name) - server = wsgi.Server(app, host=host, port=port) + server = wsgi_server.Server(app, host=host, port=port) if CONF.ssl.enable: server.set_ssl(CONF.ssl.certfile, CONF.ssl.keyfile, CONF.ssl.ca_certs, CONF.ssl.cert_required) @@ -106,8 +106,7 @@ if __name__ == '__main__': # http://lists.openstack.org/pipermail/openstack-dev/2012-August/ # 000794.html monkeypatch_thread = False - eventlet.patcher.monkey_patch(all=False, socket=True, time=True, - thread=monkeypatch_thread) + wsgi_server.monkey_patch_eventlet(monkeypatch_thread=monkeypatch_thread) options = deploy.appconfig('config:%s' % paste_config) |