From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 2 Nov 2018 21:06:25 +0000 (+0100)
Subject: Do not log FileLock as exception
X-Git-Tag: v14.0.4RC1~26^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=aaf060893c2f1d564d94038994000a0a8e549324;p=nextcloud-server.git

Do not log FileLock as exception

There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---

diff --git a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
index ecfd0e5692d..d134a0efaff 100644
--- a/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
@@ -26,6 +26,7 @@
 
 namespace OCA\DAV\Connector\Sabre;
 
+use OCA\DAV\Connector\Sabre\Exception\FileLocked;
 use OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden;
 use OCP\Files\StorageNotAvailableException;
 use OCP\ILogger;
@@ -69,6 +70,8 @@ class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
 		// happens when a certain method is not allowed to be called
 		// for example creating a folder that already exists
 		MethodNotAllowed::class => true,
+		// A locked file is perfectly valid and can happen in various cases
+		FileLocked::class => true,
 	];
 
 	/** @var string */