diff options
author | Jamie Lennox <jlennox@redhat.com> | 2013-05-30 17:48:04 +1000 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2013-06-18 14:10:36 -0400 |
commit | 3afd9791ef3e2472987cdabb54ef5f27a062469c (patch) | |
tree | e4bb40f0431bd3061a9fc6ea66f8df5aa6be067e /keystone/token | |
parent | a012186bb68c5514dda87f1e045983a3c2e5b236 (diff) | |
download | keystone-3afd9791ef3e2472987cdabb54ef5f27a062469c.tar.gz keystone-3afd9791ef3e2472987cdabb54ef5f27a062469c.tar.xz keystone-3afd9791ef3e2472987cdabb54ef5f27a062469c.zip |
Isolate eventlet code into environment.
The environment module will be configured once, during code initialization.
Subsequently all other possibly-evented modules will retrieve from
environment and transparently obtain either the eventlet or standard
library modules.
If eventlet, httplib, subprocess or other environment dependant module
is referenced outside of the environment module it should be considered
a bug.
The changes to tests are required to ensure that test is imported first
to setup the environment. Hopefully these can all be replaced with an
__init__.py in a post-nose keystone.
Implements: blueprint extract-eventlet
Change-Id: Icacd6f2ee0906ac5d303777c1f87a184f38283bf
Diffstat (limited to 'keystone/token')
-rw-r--r-- | keystone/token/controllers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py index 2d429742..68a3ebcd 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -1,10 +1,10 @@ import json -import subprocess import uuid from keystone.common import cms from keystone.common import controller from keystone.common import dependency +from keystone.common import environment from keystone.common import logging from keystone.common import utils from keystone import config @@ -117,7 +117,7 @@ class Auth(controller.V2Controller): token_id = cms.cms_sign_token(json.dumps(token_data), CONF.signing.certfile, CONF.signing.keyfile) - except subprocess.CalledProcessError: + except environment.subprocess.CalledProcessError: raise exception.UnexpectedError(_( 'Unable to sign token.')) else: |