dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
mdipierro
2019-09-30 20:47:15 -07:00
parent c95b4e43d7 501d0b8a9b
commit 1ce316609a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/login_methods/saml2_auth.py
+3 -3
View File
@@ -150,14 +150,14 @@ class Saml2Auth(object):
self.config_file = config_file self.config_file = config_file
self.maps = maps self.maps = maps
# URL for redirecting users to when they sign out # URL for redirecting users to when they sign out
self.saml_logout_url = logout_url self.saml_logout_url = logout_url
# URL to let users change their password in the IDP system # URL to let users change their password in the IDP system
self.saml_change_password_url = change_password_url self.saml_change_password_url = change_password_url
# URL to specify an IDP if using federation metadata or an MDQ # URL to specify an IDP if using federation metadata or an MDQ
self.entityid = entityid self.entityid = entityid
def login_url(self, next="/"): def login_url(self, next="/"):
d = saml2_handler(current.session, current.request, entityid=self.entityid) d = saml2_handler(current.session, current.request, entityid=self.entityid)
gluon/contrib/redis_cache.py
+3 -3
View File
@@ -208,12 +208,12 @@ class RedisClient(object):
def retry_call(self, key, f, time_expire, with_lock): def retry_call(self, key, f, time_expire, with_lock):
self.RETRIES += 1 self.RETRIES += 1
if self.RETRIES <= self.MAX_RETRIES: if self.RETRIES <= self.MAX_RETRIES:
logger.error("sleeping %s seconds before reconnecting" % (2 * self.RETRIES))
time.sleep(2 * self.RETRIES)
if self.fail_gracefully: if self.fail_gracefully:
self.RETRIES = 0 self.RETRIES = 0
return f() return f()
logger.error("sleeping %s seconds before reconnecting" % (2 * self.RETRIES))
time.sleep(2 * self.RETRIES)
return self.__call__(key, f, time_expire, with_lock) return self.__call__(key, f, time_expire, with_lock)
else: else:
self.RETRIES = 0 self.RETRIES = 0