diff options
| author | venkata edara <redara@redhat.com> | 2017-05-10 13:27:38 +0530 |
|---|---|---|
| committer | Prashanth Pai <ppai@redhat.com> | 2017-05-11 05:48:27 +0000 |
| commit | 513988915aa1af13a989d062b021fe1562cbf18d (patch) | |
| tree | 1c281911e3a9bfa97f8a7285f20691cb77c45c1d /gluster/swift/common/middleware/gswauth/swauth | |
| parent | e9c2c5eb55e1012ccce0ce51ac48bed0c0f1d4b7 (diff) | |
Rebase to Swift 2.10.1 (newton)
Change-Id: I53a962c9a301089c8aed0b43c50f944c30225944
Signed-off-by: venkata edara <redara@redhat.com>
Reviewed-on: https://review.gluster.org/16653
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Tested-by: Prashanth Pai <ppai@redhat.com>
Diffstat (limited to 'gluster/swift/common/middleware/gswauth/swauth')
| -rw-r--r-- | gluster/swift/common/middleware/gswauth/swauth/middleware.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py index 7a6d713..a266d74 100644 --- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py +++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py @@ -379,7 +379,7 @@ class Swauth(object): if memcache_client: memcache_client.set( memcache_key, (time() + expires_from_now, groups), - timeout=expires_from_now) + time=expires_from_now) else: path = quote('/v1/%s/.token_%s/%s' % (self.auth_account, token[-1], token)) @@ -401,7 +401,7 @@ class Swauth(object): memcache_client.set( memcache_key, (detail['expires'], groups), - timeout=float(detail['expires'] - time())) + time=float(detail['expires'] - time())) return groups def authorize(self, req): @@ -1448,7 +1448,7 @@ class Swauth(object): (self.itoken_expires, '%s,.reseller_admin,%s' % (self.metadata_volume, self.auth_account)), - timeout=self.token_life) + time=self.token_life) return self.itoken def get_admin_detail(self, req): |