diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-07-05 22:37:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 22:37:12 +0200 |
| commit | e900f424ce16c40b85adc89387ab3b369140f532 (patch) | |
| tree | b27acb63303ed1085fe6158aafbb685d92bcab63 /lib/private/Files/Storage | |
| parent | d3d11cb826654d9c597443edb1d22d63521a2698 (diff) | |
| parent | da2d4250446b6e2f921bd3de0420738881792bd3 (diff) | |
| download | nextcloud-server-e900f424ce16c40b85adc89387ab3b369140f532.tar.gz nextcloud-server-e900f424ce16c40b85adc89387ab3b369140f532.zip | |
Merge pull request #21636 from nextcloud/lock-exception-readable-path
add proper paths to locking exceptions
Diffstat (limited to 'lib/private/Files/Storage')
| -rw-r--r-- | lib/private/Files/Storage/Common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index 001b16cb3b4..6c57405619a 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -747,7 +747,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { ); } try { - $provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type); + $provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type, $this->getId() . '::' . $path); } catch (LockedException $e) { if ($logger) { $logger->logException($e, ['level' => ILogger::INFO]); |