forward object not found error in swift as dav 404
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
parent
e2c819f617
commit
05fddcd7ae
|
@ -44,6 +44,7 @@ use OCP\Files\ForbiddenException;
|
|||
use OCP\Files\InvalidContentException;
|
||||
use OCP\Files\InvalidPathException;
|
||||
use OCP\Files\LockNotAcquiredException;
|
||||
use OCP\Files\NotFoundException;
|
||||
use OCP\Files\NotPermittedException;
|
||||
use OCP\Files\StorageNotAvailableException;
|
||||
use OCP\Lock\ILockingProvider;
|
||||
|
@ -324,6 +325,8 @@ class File extends Node implements IFile {
|
|||
throw new DAVForbiddenException($ex->getMessage(), $ex->getRetry());
|
||||
} catch (LockedException $e) {
|
||||
throw new FileLocked($e->getMessage(), $e->getCode(), $e);
|
||||
} catch (NotFoundException $e) {
|
||||
throw new NotFound('File not found: ' . $e->getMessage(), $e->getCode(), $e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -28,6 +28,8 @@ namespace OC\Files\ObjectStore;
|
|||
use Icewind\Streams\CallbackWrapper;
|
||||
use Icewind\Streams\IteratorDirectory;
|
||||
use OC\Files\Cache\CacheEntry;
|
||||
use OC\Files\Stream\CountReadStream;
|
||||
use OCP\Files\NotFoundException;
|
||||
use OCP\Files\ObjectStore\IObjectStore;
|
||||
|
||||
class ObjectStoreStorage extends \OC\Files\Storage\Common {
|
||||
|
@ -269,10 +271,16 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
|
|||
if (is_array($stat)) {
|
||||
try {
|
||||
return $this->objectStore->readObject($this->getURN($stat['fileid']));
|
||||
} catch (NotFoundException $e) {
|
||||
$this->logger->logException($e, [
|
||||
'app' => 'objectstore',
|
||||
'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
|
||||
]);
|
||||
throw $e;
|
||||
} catch (\Exception $ex) {
|
||||
$this->logger->logException($ex, [
|
||||
'app' => 'objectstore',
|
||||
'message' => 'Count not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
|
||||
'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
|
||||
]);
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -26,12 +26,14 @@ namespace OC\Files\ObjectStore;
|
|||
|
||||
use Guzzle\Http\Exception\ClientErrorResponseException;
|
||||
use Icewind\Streams\RetryWrapper;
|
||||
use OCP\Files\NotFoundException;
|
||||
use OCP\Files\ObjectStore\IObjectStore;
|
||||
use OCP\Files\StorageAuthException;
|
||||
use OCP\Files\StorageNotAvailableException;
|
||||
use OpenCloud\Common\Service\Catalog;
|
||||
use OpenCloud\Common\Service\CatalogItem;
|
||||
use OpenCloud\Identity\Resource\Token;
|
||||
use OpenCloud\ObjectStore\Exception\ObjectNotFoundException;
|
||||
use OpenCloud\ObjectStore\Service;
|
||||
use OpenCloud\OpenStack;
|
||||
use OpenCloud\Rackspace;
|
||||
|
@ -251,13 +253,17 @@ class Swift implements IObjectStore {
|
|||
* @throws Exception from openstack lib when something goes wrong
|
||||
*/
|
||||
public function readObject($urn) {
|
||||
$this->init();
|
||||
$object = $this->container->getObject($urn);
|
||||
try {
|
||||
$this->init();
|
||||
$object = $this->container->getObject($urn);
|
||||
|
||||
// we need to keep a reference to objectContent or
|
||||
// the stream will be closed before we can do anything with it
|
||||
/** @var $objectContent \Guzzle\Http\EntityBody * */
|
||||
$objectContent = $object->getContent();
|
||||
// we need to keep a reference to objectContent or
|
||||
// the stream will be closed before we can do anything with it
|
||||
/** @var $objectContent \Guzzle\Http\EntityBody * */
|
||||
$objectContent = $object->getContent();
|
||||
} catch (ObjectNotFoundException $e) {
|
||||
throw new NotFoundException("object $urn not found in object store");
|
||||
}
|
||||
$objectContent->rewind();
|
||||
|
||||
$stream = $objectContent->getStream();
|
||||
|
|
Loading…
Reference in New Issue