diff options
Diffstat (limited to 'keystoneclient/middleware/auth_token.py')
| -rw-r--r-- | keystoneclient/middleware/auth_token.py | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index 2fb6216..98a427b 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -158,6 +158,7 @@ from keystoneclient.openstack.common import jsonutils from keystoneclient.common import cms from keystoneclient import utils from keystoneclient.middleware import memcache_crypt +from keystoneclient.openstack.common import memorycache from keystoneclient.openstack.common import timeutils CONF = None @@ -361,16 +362,8 @@ class AuthProtocol(object): self._cache = env.get(cache) else: # use Keystone memcache - memcache_servers = self._conf_get('memcache_servers') - if memcache_servers: - try: - import memcache - self.LOG.info('Using Keystone memcache for caching token') - self._cache = memcache.Client(memcache_servers) - self._use_keystone_cache = True - except ImportError as e: - msg = 'disabled caching due to missing libraries %s' % (e) - self.LOG.warn(msg) + self._cache = memorycache.get_client(memcache_servers) + self._use_keystone_cache = True self._cache_initialized = True def _conf_get(self, name): @@ -989,12 +982,8 @@ class AuthProtocol(object): additional_headers=headers) if response.status == 200: - self._cache_put(user_token, data) return data if response.status == 404: - # FIXME(ja): I'm assuming the 404 status means that user_token is - # invalid - not that the admin_token is invalid - self._cache_store_invalid(user_token) self.LOG.warn("Authorization failed for token %s", user_token) raise InvalidUserToken('Token authorization failed') if response.status == 401: |