Skip to content

Commit

Permalink
MDL-43349 cache: init now checks store requirements are met
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Hemelryk committed Jan 1, 2014
1 parent bbb291b commit 07658be
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
10 changes: 8 additions & 2 deletions cache/classes/factory.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,11 @@ public function create_cache_from_params($mode, $component, $area, array $identi
public function create_cache(cache_definition $definition) {
$class = $definition->get_cache_class();
$stores = cache_helper::get_stores_suitable_for_definition($definition);
foreach ($stores as $key => $store) {
if (!$store::are_requirements_met()) {
unset($stores[$key]);
}
}
if (count($stores) === 0) {
// Hmm still no stores, better provide a dummy store to mimic functionality. The dev will be none the wiser.
$stores[] = $this->create_dummy_store($definition);
Expand All @@ -253,7 +258,7 @@ public function create_cache(cache_definition $definition) {
/**
* Creates a store instance given its name and configuration.
*
* If the store has already been instantiated then the original objetc will be returned. (reused)
* If the store has already been instantiated then the original object will be returned. (reused)
*
* @param string $name The name of the store (must be unique remember)
* @param array $details
Expand All @@ -267,8 +272,9 @@ public function create_store_from_config($name, array $details, cache_definition
$store = new $class($details['name'], $details['configuration']);
$this->stores[$name] = $store;
}
/* @var cache_store $store */
$store = $this->stores[$name];
if (!$store->is_ready() || !$store->is_supported_mode($definition->get_mode())) {
if (!$store::are_requirements_met() || !$store->is_ready() || !$store->is_supported_mode($definition->get_mode())) {
return false;
}
// We always create a clone of the original store.
Expand Down
3 changes: 2 additions & 1 deletion cache/classes/helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,9 @@ public static function purge_store($storename, cache_config $config = null) {
$class = $store['class'];

// Found the store: is it ready?
/* @var cache_store $instance */
$instance = new $class($store['name'], $store['configuration']);
if (!$instance->is_ready()) {
if (!$instance::are_requirements_met() || !$instance->is_ready()) {
unset($instance);
return false;
}
Expand Down

0 comments on commit 07658be

Please sign in to comment.