moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-38387 cache: removed call to plugins API from cache API

Browse source
This commit is contained in:
Sam Hemelryk 2013-03-20 16:06:07 +13:00
parent a3b63be703
commit 7b9cb736ba
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cache/classes/factory.php vendored
View file

@ -103,7 +103,7 @@ class cache_factory {
* An array of lock plugins. * An array of lock plugins.
* @var array * @var array
*/ */
protected $lockplugins = null; protected $lockplugins = array();
/** /**
* The current state of the cache API. * The current state of the cache API.
@ -155,7 +155,7 @@ class cache_factory {
$factory->stores = array(); $factory->stores = array();
$factory->configs = array(); $factory->configs = array();
$factory->definitions = array(); $factory->definitions = array();
$factory->lockplugins = null; // MUST be null in order to force its regeneration. $factory->lockplugins = array(); // MUST be null in order to force its regeneration.
// Reset the state to uninitialised. // Reset the state to uninitialised.
$factory->state = self::STATE_UNINITIALISED; $factory->state = self::STATE_UNINITIALISED;
} }
@ -406,7 +406,7 @@ class cache_factory {
$definition = $instance->get_definition_by_id($id); $definition = $instance->get_definition_by_id($id);
if (!$definition) { if (!$definition) {
throw new coding_exception('The requested cache definition does not exist.'. $id, $id); throw new coding_exception('The requested cache definition does not exist.'. $id, $id);
} else { } else if (!$this->is_disabled()) {
debugging('Cache definitions reparsed causing cache reset in order to locate definition. debugging('Cache definitions reparsed causing cache reset in order to locate definition.
You should bump the version number to ensure definitions are reprocessed.', DEBUG_DEVELOPER); You should bump the version number to ensure definitions are reprocessed.', DEBUG_DEVELOPER);
} }
@ -442,6 +442,7 @@ class cache_factory {
* @return cache_lock_interface * @return cache_lock_interface
*/ */
public function create_lock_instance(array $config) { public function create_lock_instance(array $config) {
global $CFG;
if (!array_key_exists('name', $config) || !array_key_exists('type', $config)) { if (!array_key_exists('name', $config) || !array_key_exists('type', $config)) {
throw new coding_exception('Invalid cache lock instance provided'); throw new coding_exception('Invalid cache lock instance provided');
} }
@ -450,8 +451,16 @@ class cache_factory {
unset($config['name']); unset($config['name']);
unset($config['type']); unset($config['type']);
if ($this->lockplugins === null) { if (!isset($this->lockplugins[$type])) {
$this->lockplugins = get_plugin_list_with_class('cachelock', '', 'lib.php'); $pluginname = substr($type, 10);
$file = $CFG->dirroot."/cache/locks/{$pluginname}/lib.php";
if (file_exists($file) && is_readable($file)) {
require_once($file);
}
if (!class_exists($type)) {
throw new coding_exception('Invalid lock plugin requested.');
}
$this->lockplugins[$type] = $type;
} }
if (!array_key_exists($type, $this->lockplugins)) { if (!array_key_exists($type, $this->lockplugins)) {
throw new coding_exception('Invalid cache lock type.'); throw new coding_exception('Invalid cache lock type.');