upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #35839 from nextcloud/feat/user_ldap-longer-ttl-for-fallback

Browse source 
Apply a longer TTL of 15min to falling back on backup server
This commit is contained in:
Vincent Petry 2022-12-20 17:19:56 +01:00 committed by GitHub
commit 13d5426893
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/user_ldap/lib/Connection.php
View file

@ -292,7 +292,7 @@ class Connection extends LDAPUtility {
* @param string $key
* @param mixed $value
*/
public function writeToCache($key, $value): void {
public function writeToCache($key, $value, int $ttlOverride = null): void {
if (!$this->configured) {
$this->readConfiguration();
}
@ -303,7 +303,8 @@ class Connection extends LDAPUtility {
}
$key = $this->getCacheKey($key);
$value = base64_encode(json_encode($value));
$this->cache->set($key, $value, $this->configuration->ldapCacheTTL);
$ttl = $ttlOverride ?? $this->configuration->ldapCacheTTL;
$this->cache->set($key, $value, $ttl);
}
public function clearCache() {
@ -635,8 +636,8 @@ class Connection extends LDAPUtility {
$this->ldap->errno($this->ldapConnectionRes) : -1;
if ($bindStatus && $error === 0 && !$forceBackupHost) {
//when bind to backup server succeeded and failed to main server,
//skip contacting him until next cache refresh
$this->writeToCache($overrideCacheKey, true);
//skip contacting it for 15min
$this->writeToCache($overrideCacheKey, true, 60 * 15);
}
return $bindStatus;