Skip to content

Commit

Permalink
Merge pull request #6942 from nextcloud/12-6826
Browse files Browse the repository at this point in the history
[stable12] Fix class name in exception logger plugin
  • Loading branch information
nickvergessen authored Oct 25, 2017
2 parents 469285a + 89d4e1f commit aef69ef
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,34 @@

namespace OCA\DAV\Connector\Sabre;

use OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden;
use OCP\Files\StorageNotAvailableException;
use OCP\ILogger;
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\NotAuthenticated;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Exception\PreconditionFailed;
use Sabre\DAV\Exception\ServiceUnavailable;

class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
protected $nonFatalExceptions = [
'Sabre\DAV\Exception\NotAuthenticated' => true,
NotAuthenticated::class => true,
// If tokenauth can throw this exception (which is basically as
// NotAuthenticated. So not fatal.
'OCA\DAV\Connector\Sabre\Exception\PasswordLoginForbidden' => true,
PasswordLoginForbidden::class => true,
// the sync client uses this to find out whether files exist,
// so it is not always an error, log it as debug
'Sabre\DAV\Exception\NotFound' => true,
NotFound::class => true,
// this one mostly happens when the same file is uploaded at
// exactly the same time from two clients, only one client
// wins, the second one gets "Precondition failed"
'Sabre\DAV\Exception\PreconditionFailed' => true,
PreconditionFailed::class => true,
// forbidden can be expected when trying to upload to
// read-only folders for example
'Sabre\DAV\Exception\Forbidden' => true,
Forbidden::class => true,
// Happens when an external storage or federated share is temporarily
// not available
'Sabre\DAV\Exception\StorageNotAvailableException' => true,
StorageNotAvailableException::class => true,
];

/** @var string */
Expand Down

0 comments on commit aef69ef

Please sign in to comment.