making all use of time follow datetime.utcnow()
fixes bug 954057 Change-Id: I14fa475dc03410b8843ab028d30fbc8802c4be30
This commit is contained in:
parent
1e07b98d77
commit
dee81534cb
|
@ -27,7 +27,7 @@ class Token(kvs.Base, token.Driver):
|
|||
def get_token(self, token_id):
|
||||
token = self.db.get('token-%s' % token_id)
|
||||
if (token and (token['expires'] is None
|
||||
or token['expires'] > datetime.datetime.now())):
|
||||
or token['expires'] > datetime.datetime.utcnow())):
|
||||
return token
|
||||
else:
|
||||
raise exception.TokenNotFound(token_id=token_id)
|
||||
|
|
|
@ -50,7 +50,7 @@ class Token(sql.Base, token.Driver):
|
|||
def get_token(self, token_id):
|
||||
session = self.get_session()
|
||||
token_ref = session.query(TokenModel).filter_by(id=token_id).first()
|
||||
now = datetime.datetime.now()
|
||||
now = datetime.datetime.utcnow()
|
||||
if token_ref and (not token_ref.expires or now < token_ref.expires):
|
||||
return token_ref.to_dict()
|
||||
else:
|
||||
|
|
|
@ -89,8 +89,8 @@ class Driver(object):
|
|||
def _get_default_expire_time(self):
|
||||
"""Determine when a token should expire based on the config.
|
||||
|
||||
:returns: datetime.datetime object
|
||||
:returns: a naive utc datetime.datetime object
|
||||
|
||||
"""
|
||||
expire_delta = datetime.timedelta(seconds=CONF.token.expiration)
|
||||
return datetime.datetime.now() + expire_delta
|
||||
return datetime.datetime.utcnow() + expire_delta
|
||||
|
|
|
@ -42,7 +42,7 @@ class MemcacheClient(object):
|
|||
"""Retrieves the value for a key or None."""
|
||||
self.check_key(key)
|
||||
obj = self.cache.get(key)
|
||||
now = time.mktime(datetime.datetime.now().timetuple())
|
||||
now = time.mktime(datetime.datetime.utcnow().timetuple())
|
||||
if obj and (obj[1] == 0 or obj[1] > now):
|
||||
return obj[0]
|
||||
else:
|
||||
|
|
Loading…
Reference in New Issue