From 9b42f6f85b076202055bb90820db3499cc6015e5 Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Thu, 25 Feb 2016 14:20:31 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/13522 Reviewed-by: Thiago da Silva Tested-by: Thiago da Silva --- gluster/swift/common/middleware/gswauth/swauth/middleware.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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( -- cgit