Log more info about locking conflicts for memcache locking backends

Signed-off-by: Robin Appelman <robin@icewind.nl>

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/public/Lock/LockedException.php b/lib/public/Lock/LockedException.php
index 1378f437c3a..b4038f8dd55 100644
--- a/lib/public/Lock/LockedException.php
+++ b/lib/public/Lock/LockedException.php
@@ -46,11 +46,15 @@ class LockedException extends \Exception {
 	 *
 	 * @param string $path locked path
 	 * @param \Exception|null $previous previous exception for cascading
-	 *
+	 * @param string $existingLock since 14.0.0
 	 * @since 8.1.0
 	 */
-	public function __construct(string $path, \Exception $previous = null) {
-		parent::__construct('"' . $path . '" is locked', 0, $previous);
+	public function __construct(string $path, \Exception $previous = null, string $existingLock = null) {
+		$message = '"' . $path . '" is locked';
+		if ($existingLock) {
+			$message .= ', existing lock on file: ' . $existingLock;
+		}
+		parent::__construct($message, 0, $previous);
 		$this->path = $path;
 	}