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 /keystone/middleware | |
| 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 'keystone/middleware')
| -rw-r--r-- | keystone/middleware/auth_token.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py index c4dddc7b..86fcb66b 100644 --- a/keystone/middleware/auth_token.py +++ b/keystone/middleware/auth_token.py @@ -99,7 +99,6 @@ import json import logging import os import stat -import subprocess import time import webob import webob.exc @@ -736,7 +735,7 @@ class AuthProtocol(object): try: output = cms.cms_verify(data, self.signing_cert_file_name, self.ca_file_name) - except subprocess.CalledProcessError as err: + except cms.subprocess.CalledProcessError as err: if self.cert_file_missing(err, self.signing_cert_file_name): self.fetch_signing_cert() continue |