mirror of
https://github.com/nextcloud/server.git
synced 2024-08-30 17:57:26 +02:00
Migrate storate status code to storagenotavailablexception
This commit is contained in:
parent
4ead2bc861
commit
98f5c50aa4
@ -38,6 +38,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
|
||||
use \OCP\Files\StorageNotAvailableException;
|
||||
use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
|
||||
use \OCA\Files_External\Service\BackendService;
|
||||
use \OCP\Files\StorageNotAvailableException;
|
||||
|
||||
/**
|
||||
* Base class for storages controllers
|
||||
@ -238,7 +239,7 @@ abstract class StoragesController extends Controller {
|
||||
);
|
||||
} catch (InsufficientDataForMeaningfulAnswerException $e) {
|
||||
$storage->setStatus(
|
||||
\OC_Mount_Config::STATUS_INDETERMINATE,
|
||||
StorageNotAvailableException::STATUS_INDETERMINATE,
|
||||
$this->l10n->t('Insufficient data: %s', [$e->getMessage()])
|
||||
);
|
||||
} catch (StorageNotAvailableException $e) {
|
||||
@ -249,7 +250,7 @@ abstract class StoragesController extends Controller {
|
||||
} catch (\Exception $e) {
|
||||
// FIXME: convert storage exceptions to StorageNotAvailableException
|
||||
$storage->setStatus(
|
||||
\OC_Mount_Config::STATUS_ERROR,
|
||||
StorageNotAvailableException::STATUS_ERROR,
|
||||
get_class($e).': '.$e->getMessage()
|
||||
);
|
||||
}
|
||||
|
@ -36,6 +36,7 @@ use \OCA\Files_External\Appinfo\Application;
|
||||
use \OCA\Files_External\Lib\Backend\LegacyBackend;
|
||||
use \OCA\Files_External\Lib\StorageConfig;
|
||||
use \OCA\Files_External\Lib\Backend\Backend;
|
||||
use \OCP\Files\StorageNotAvailableException;
|
||||
|
||||
/**
|
||||
* Class to configure mount.json globally and for users
|
||||
@ -48,11 +49,6 @@ class OC_Mount_Config {
|
||||
const MOUNT_TYPE_USER = 'user';
|
||||
const MOUNT_TYPE_PERSONAL = 'personal';
|
||||
|
||||
// getBackendStatus return types
|
||||
const STATUS_SUCCESS = 0;
|
||||
const STATUS_ERROR = 1;
|
||||
const STATUS_INDETERMINATE = 2;
|
||||
|
||||
// whether to skip backend test (for unit tests, as this static class is not mockable)
|
||||
public static $skipTest = false;
|
||||
|
||||
@ -219,7 +215,7 @@ class OC_Mount_Config {
|
||||
*/
|
||||
public static function getBackendStatus($class, $options, $isPersonal) {
|
||||
if (self::$skipTest) {
|
||||
return self::STATUS_SUCCESS;
|
||||
return StorageNotAvailableException::STATUS_SUCCESS;
|
||||
}
|
||||
foreach ($options as &$option) {
|
||||
$option = self::setUserVars(OCP\User::getUser(), $option);
|
||||
@ -233,7 +229,7 @@ class OC_Mount_Config {
|
||||
$result = $storage->test($isPersonal);
|
||||
$storage->setAvailability($result);
|
||||
if ($result) {
|
||||
return self::STATUS_SUCCESS;
|
||||
return StorageNotAvailableException::STATUS_SUCCESS;
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
$storage->setAvailability(false);
|
||||
@ -244,7 +240,7 @@ class OC_Mount_Config {
|
||||
throw $exception;
|
||||
}
|
||||
}
|
||||
return self::STATUS_ERROR;
|
||||
return StorageNotAvailableException::STATUS_ERROR;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -31,6 +31,7 @@ use \OCA\Files_external\NotFoundException;
|
||||
use \OCA\Files_External\Service\BackendService;
|
||||
use \OCA\Files_External\Lib\Backend\Backend;
|
||||
use \OCA\Files_External\Lib\Auth\AuthMechanism;
|
||||
use \OCP\Files\StorageNotAvailableException;
|
||||
|
||||
/**
|
||||
* Service class to manage external storages
|
||||
@ -411,7 +412,7 @@ abstract class StoragesService {
|
||||
|
||||
$this->triggerHooks($newStorage, Filesystem::signal_create_mount);
|
||||
|
||||
$newStorage->setStatus(\OC_Mount_Config::STATUS_SUCCESS);
|
||||
$newStorage->setStatus(StorageNotAvailableException::STATUS_SUCCESS);
|
||||
return $newStorage;
|
||||
}
|
||||
|
||||
|
@ -37,6 +37,9 @@ use OC\HintException;
|
||||
*/
|
||||
class StorageNotAvailableException extends HintException {
|
||||
|
||||
const STATUS_SUCCESS = 0;
|
||||
const STATUS_ERROR = 1;
|
||||
const STATUS_INDETERMINATE = 2;
|
||||
const STATUS_INCOMPLETE_CONF = 3;
|
||||
const STATUS_UNAUTHORIZED = 4;
|
||||
const STATUS_TIMEOUT = 5;
|
||||
|
Loading…
Reference in New Issue
Block a user