Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2016-06-01 22:31:14 +0300
committerRoeland Jago Douma <rullzer@owncloud.com>2016-06-01 22:31:14 +0300
commit0efe3ba62eeb0faf130bc92c4ca885139bc14d0a (patch)
tree714503b7920daf9de5a22b2c317191fcaa58468a /apps
parent96bf7f5513616d0320c96911eedd5d0d7b606ab2 (diff)
Use a capped memory cache for the user/group cache
For #24403 When upgrading huge installations this can lead to memory problems as the cache will only grow and grow. Capping this memory will make sure we don't run out while during normal operation still basically cache everything.
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/group_ldap.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index eba39ca50f7..891c807cd74 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -36,6 +36,7 @@ namespace OCA\user_ldap;
use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\BackendUtility;
+use OC\Cache\CappedMemoryCache;
class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
protected $enabled = false;
@@ -43,12 +44,12 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
/**
* @var string[] $cachedGroupMembers array of users with gid as key
*/
- protected $cachedGroupMembers = array();
+ protected $cachedGroupMembers;
/**
* @var string[] $cachedGroupsByMember array of groups with uid as key
*/
- protected $cachedGroupsByMember = array();
+ protected $cachedGroupsByMember;
public function __construct(Access $access) {
parent::__construct($access);
@@ -57,6 +58,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
if(!empty($filter) && !empty($gassoc)) {
$this->enabled = true;
}
+
+ $this->cachedGroupMembers = new CappedMemoryCache();
+ $this->cachedGroupsByMember = new CappedMemoryCache();
}
/**