|
|
|
|
@ -86,34 +86,14 @@ class Factory implements ICacheFactory { |
|
|
|
|
$missingCacheMessage = 'Memcache {class} not available for {use} cache'; |
|
|
|
|
$missingCacheHint = 'Is the matching PHP module installed and enabled?'; |
|
|
|
|
if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) { |
|
|
|
|
if (\OC::$CLI && !defined('PHPUNIT_RUN')) { |
|
|
|
|
// CLI should not hard-fail on broken memcache |
|
|
|
|
$this->logger->info($missingCacheMessage, [ |
|
|
|
|
'class' => $localCacheClass, |
|
|
|
|
'use' => 'local', |
|
|
|
|
'app' => 'cli' |
|
|
|
|
]); |
|
|
|
|
$localCacheClass = self::NULL_CACHE; |
|
|
|
|
} else { |
|
|
|
|
throw new \OC\HintException(strtr($missingCacheMessage, [ |
|
|
|
|
'{class}' => $localCacheClass, '{use}' => 'local' |
|
|
|
|
]), $missingCacheHint); |
|
|
|
|
} |
|
|
|
|
throw new \OC\HintException(strtr($missingCacheMessage, [ |
|
|
|
|
'{class}' => $localCacheClass, '{use}' => 'local' |
|
|
|
|
]), $missingCacheHint); |
|
|
|
|
} |
|
|
|
|
if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) { |
|
|
|
|
if (\OC::$CLI && !defined('PHPUNIT_RUN')) { |
|
|
|
|
// CLI should not hard-fail on broken memcache |
|
|
|
|
$this->logger->info($missingCacheMessage, [ |
|
|
|
|
'class' => $distributedCacheClass, |
|
|
|
|
'use' => 'distributed', |
|
|
|
|
'app' => 'cli' |
|
|
|
|
]); |
|
|
|
|
$distributedCacheClass = self::NULL_CACHE; |
|
|
|
|
} else { |
|
|
|
|
throw new \OC\HintException(strtr($missingCacheMessage, [ |
|
|
|
|
'{class}' => $distributedCacheClass, '{use}' => 'distributed' |
|
|
|
|
]), $missingCacheHint); |
|
|
|
|
} |
|
|
|
|
throw new \OC\HintException(strtr($missingCacheMessage, [ |
|
|
|
|
'{class}' => $distributedCacheClass, '{use}' => 'distributed' |
|
|
|
|
]), $missingCacheHint); |
|
|
|
|
} |
|
|
|
|
if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) { |
|
|
|
|
// don't fallback since the fallback might not be suitable for storing lock |
|
|
|
|
|