wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16578 from nextcloud/backport/16558/stable16

Browse source 
[stable16] Do not log all locked exceptions
This commit is contained in:
Roeland Jago Douma 2019-07-29 10:40:23 +02:00 committed by GitHub
commit 5ac52d2e09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/Files/Storage/Common.php
View file

@ -715,7 +715,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
$provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
} catch (LockedException $e) {
if ($logger) {
$logger->logException($e);
$logger->logException($e, ['level' => ILogger::INFO]);
}
throw $e;
}
@ -747,7 +747,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
$provider->releaseLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
} catch (LockedException $e) {
if ($logger) {
$logger->logException($e);
$logger->logException($e, ['level' => ILogger::INFO]);
}
throw $e;
}
@ -778,7 +778,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
try {
$provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
} catch (LockedException $e) {
\OC::$server->getLogger()->logException($e);
\OC::$server->getLogger()->logException($e, ['level' => ILogger::INFO]);
throw $e;
}
}