diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-11-09 13:53:48 -0800 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2012-11-09 17:56:29 -0500 |
| commit | 164326b433c7e8b7ff5afe4e478d346233a4062b (patch) | |
| tree | 75809399f979db5d948d944e82828df3dee359b5 /bin | |
| parent | a10bd7a8eb418a4d9e84a9511ca3f0669e6e02e7 (diff) | |
| download | keystone-164326b433c7e8b7ff5afe4e478d346233a4062b.tar.gz keystone-164326b433c7e8b7ff5afe4e478d346233a4062b.tar.xz keystone-164326b433c7e8b7ff5afe4e478d346233a4062b.zip | |
Use the right subprocess based on os monkeypatch
This works around the following eventlet bug:
https://bitbucket.org/which_linden/eventlet/issue/92
by using the green version of Popen if os has been
monkeypatched. It also has the side effect of making the ssl
calls not block the reactor for workers that use eventlet.
Change-Id: I1457237f52310f0536fbcdcaa42174b17e8edbf5
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/keystone-all | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index a51bb2c6..7724660d 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -3,7 +3,6 @@ import greenlet import eventlet -from eventlet.green import subprocess import logging import os import signal @@ -23,7 +22,6 @@ if os.path.exists(os.path.join(possible_topdir, from paste import deploy from keystone import config -from keystone.common import cms from keystone.common import wsgi from keystone.common import utils from keystone.openstack.common import importutils @@ -70,8 +68,6 @@ def serve(*servers): except greenlet.GreenletExit: pass -def monkeypatch_cms(): - cms.Popen = subprocess.Popen if __name__ == '__main__': @@ -98,7 +94,6 @@ if __name__ == '__main__': monkeypatch_thread = not CONF._cli_values['standard_threads'] eventlet.patcher.monkey_patch(all=False, socket=True, time=True, thread=monkeypatch_thread) - monkeypatch_cms() options = deploy.appconfig('config:%s' % CONF.config_file[0]) |