diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-05-07 16:42:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 16:42:26 +0200 |
| commit | 7f5567e7583e67d6faac869beb118c179fff0b88 (patch) | |
| tree | a79e12bc612d05b70813a6e60e99c1158fa10e70 /lib/private/Files | |
| parent | 6d5f4432cd6962234f83ffe30f454c3348cc97f5 (diff) | |
| parent | 94c15efad00aa4d85083aff4bcab6fb529646372 (diff) | |
| download | nextcloud-server-7f5567e7583e67d6faac869beb118c179fff0b88.tar.gz nextcloud-server-7f5567e7583e67d6faac869beb118c179fff0b88.zip | |
Merge pull request #9388 from nextcloud/log-lock-state-on-conflict
Log lock state on conflict
Diffstat (limited to 'lib/private/Files')
| -rw-r--r-- | lib/private/Files/Storage/Common.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index 0d0f1da2594..b6c82f3a1df 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -776,9 +776,7 @@ abstract class Common implements Storage, ILockingStorage { try { $provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type); } catch (LockedException $e) { - if ($logger) { - $logger->logException($e); - } + \OC::$server->getLogger()->logException($e); throw $e; } } |