diff options
author | Prashanth Pai <ppai@redhat.com> | 2016-02-25 14:20:31 +0530 |
---|---|---|
committer | Thiago da Silva <thiago@redhat.com> | 2016-03-11 10:28:07 -0800 |
commit | 9b42f6f85b076202055bb90820db3499cc6015e5 (patch) | |
tree | 872b9a57683629929379843edb3011b3fbfd3147 | |
parent | 529526c68acb3acdf732d962b7cc8195081cbf56 (diff) |
Remove 60 secs subtraction from item_expires
According to https://github.com/gholt/swauth/issues/73 nobody
knows why is this here. Let's try to remove it :).
This is ported from following commit in swauth repo:
79c153f7b198ffaf0c3fd781587a0133bab43d7f
Change-Id: I8e64b53ed59dab1f554b7c08f1342c2b5dd4675a
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-on: http://review.gluster.org/13522
Reviewed-by: Thiago da Silva <thiago@redhat.com>
Tested-by: Thiago da Silva <thiago@redhat.com>
-rw-r--r-- | gluster/swift/common/middleware/gswauth/swauth/middleware.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py index ccd85ca..8581dd4 100644 --- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py +++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py @@ -1409,7 +1409,7 @@ class Swauth(object): TRUE_VALUES: self.itoken = '%sitk%s' % (self.reseller_prefix, uuid4().hex) memcache_key = '%s/auth/%s' % (self.reseller_prefix, self.itoken) - self.itoken_expires = time() + self.token_life - 60 + self.itoken_expires = time() + self.token_life memcache_client = cache_from_env(env) if not memcache_client: raise Exception( |