Skip to content

Commit 4d0315c

Browse files
authored
Merge pull request #7599 from nextcloud/quieter-debug-log
don't show recurring log msg when paged result was turned off
2 parents 7be9b38 + 82fd09c commit 4d0315c

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

apps/user_ldap/lib/Access.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,8 +1095,11 @@ private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $li
10951095
$this->pagedSearchedSuccessful = true;
10961096
}
10971097
} else {
1098-
if(!is_null($limit)) {
1099-
\OCP\Util::writeLog('user_ldap', 'Paged search was not available', \OCP\Util::INFO);
1098+
if(!is_null($limit) && intval($this->connection->ldapPagingSize) !== 0) {
1099+
\OC::$server->getLogger()->debug(
1100+
'Paged search was not available',
1101+
[ 'app' => 'user_ldap' ]
1102+
);
11001103
}
11011104
}
11021105
/* ++ Fixing RHDS searches with pages with zero results ++

apps/user_ldap/lib/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* @property boolean turnOnPasswordChange
5151
* @property boolean hasPagedResultSupport
5252
* @property string[] ldapBaseUsers
53-
* @property int|string ldapPagingSize holds an integer
53+
* @property int|null ldapPagingSize holds an integer
5454
* @property bool|mixed|void ldapGroupMemberAssocAttr
5555
* @property string ldapUuidUserAttribute
5656
* @property string ldapUuidGroupAttribute

0 commit comments

Comments
 (0)