diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-05-27 17:40:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-05-27 17:40:42 +0000 |
| commit | 8d05f8130304fd92dba031cd908929b1556a0961 (patch) | |
| tree | 02cce3065bbbeebd222997884cae66dc27368117 /keystoneclient/middleware | |
| parent | 1ba21e4b8a5d311b1cdc208fb6a33a5163257ee0 (diff) | |
| parent | 01231bbc6e5194b7dcc3f7730c94564b8e8fdcd8 (diff) | |
| download | python-keystoneclient-8d05f8130304fd92dba031cd908929b1556a0961.tar.gz | |
Merge "Cached tokens aren't expired"
Diffstat (limited to 'keystoneclient/middleware')
| -rw-r--r-- | keystoneclient/middleware/auth_token.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index 6f4104e..fa4823f 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -1014,7 +1014,7 @@ class AuthProtocol(object): env_key = self._header_to_env_var(key) return env.get(env_key, default) - def _cache_get(self, token_id, ignore_expires=False): + def _cache_get(self, token_id): """Return token information from cache. If token is invalid raise InvalidUserToken @@ -1077,7 +1077,7 @@ class AuthProtocol(object): expires = timeutils.normalize_time(expires) utcnow = timeutils.utcnow() - if ignore_expires or utcnow < expires: + if utcnow < expires: self.LOG.debug('Returning cached token') return data else: |