Skip to content

[stable13] lower log level for quota manipulation cases - #10076

Merged
blizzz merged 2 commits into
stable13from
backport/10034/stable13
Jul 2, 2018
Merged

[stable13] lower log level for quota manipulation cases#10076
blizzz merged 2 commits into
stable13from
backport/10034/stable13

Conversation

@blizzz

Copy link
Copy Markdown
Member

backport of #10034

and simplify the forest of ifs a little bit
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzzblizzz added this to the Nextcloud 13.0.5 milestone Jul 2, 2018
@blizzzblizzz changed the title lower log level for quota manipulation cases[stable13] lower log level for quota manipulation casesJul 2, 2018
Comment threadapps/user_ldap/lib/User/User.php Outdated
if($aQuota && (count($aQuota) > 0) && $this->verifyQuotaValue($aQuota[0])) {
$quota = $aQuota[0];
} else if(is_array($aQuota) && isset($aQuota[0])) {
$this->log->log('no suitable LDAP quota found for user ' . $this->uid . ': [' . $aQuota[0] . ']', \OCP\Util::DEBUG);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

log->debug() instead of constant usage?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kept it as it was for backporting reasons

Comment threadapps/user_ldap/lib/User/User.php Outdated
} else {
$this->log->log('not suitable LDAP quota found for user ' . $this->uid . ': [' . $valueFromLDAP . ']', \OCP\Util::WARN);
}
$this->log->log('no suitable LDAP quota found for user ' . $this->uid . ': [' . $valueFromLDAP . ']', \OCP\Util::DEBUG);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here and everywhere :)

@nickvergessennickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, its the backport already

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@codecov

codecovBot commented Jul 2, 2018

Copy link
Copy Markdown

Codecov Report

Merging #10076 into stable13 will decrease coverage by 20.39%.
The diff coverage is 0%.

@@ Coverage Diff @@## stable13 #10076 +/- ##
==============================================
- Coverage 51.43% 31.03% -20.4% - Complexity 25134 25138 +4 
==============================================
Files 1613 1613 Lines 95634 95632 -2 Branches 1376 1376 ==============================================
- Hits 49185 29681 -19504 - Misses 46449 65951 +19502
Impacted FilesCoverage ΔComplexity Δ
apps/user_ldap/lib/Connection.php0% <ø> (-55.25%)121 <0> (ø)
apps/user_ldap/lib/User/User.php0% <0%> (-75.43%)127 <0> (+4)
apps/user_ldap/lib/Migration/UUIDFixGroup.php0% <0%> (-100%)1% <0%> (ø)
lib/private/SystemTag/ManagerFactory.php0% <0%> (-100%)3% <0%> (ø)
apps/files_versions/lib/Command/Expire.php0% <0%> (-100%)3% <0%> (ø)
...yBuilder/FunctionBuilder/SqliteFunctionBuilder.php0% <0%> (-100%)1% <0%> (ø)
lib/public/Comments/CommentsEvent.php0% <0%> (-100%)3% <0%> (ø)
lib/private/Files/Mount/LocalHomeMountProvider.php0% <0%> (-100%)1% <0%> (ø)
apps/files_trashbin/lib/Command/Expire.php0% <0%> (-100%)3% <0%> (ø)
apps/user_ldap/lib/Mapping/UserMapping.php0% <0%> (-100%)1% <0%> (ø)
... and 376 more

@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 2, 2018
@blizzz

Copy link
Copy Markdown
MemberAuthor

failing test unrelated (ocassionally occuring files acceptance) → merging

@blizzz
blizzz merged commit d1df33a into stable13Jul 2, 2018
@blizzz
blizzz deleted the backport/10034/stable13 branch July 2, 2018 11:10
@MorrisJobkeMorrisJobke mentioned this pull request Jul 10, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: ldap

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz@nickvergessen@MorrisJobke