EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Clear cache in Data Cache
Yurii4ccde30c62a9
diff --git a/application/Espo/Core/DataManager.php b/application/Espo/Core/DataManager.phpindex 2361ead3ff..0a52156f4e 100644--- a/application/Espo/Core/DataManager.php+++ b/application/Espo/Core/DataManager.php@@ -29,12 +29,15 @@namespace Espo\Core;+use Espo\Core\Binding\Attributes\Qualify;use Espo\Core\Exceptions\Error;use Espo\Core\Hook\Control;use Espo\Core\ORM\EntityManagerProxy;+use Espo\Core\Utils\Cache\Exceptions\PersistenceError;use Espo\Core\Utils\Database\Helper as DatabaseHelper;use Espo\Core\Utils\Database\Schema\RebuildMode;use Espo\Core\Utils\Database\Schema\SchemaManagerProxy;+use Espo\Core\Utils\DataCache;use Espo\Core\Utils\File\Manager as FileManager;use Espo\Core\Utils\Metadata;use Espo\Core\Utils\Util;@@ -71,6 +74,9 @@ class DataManagerprivate DatabaseParamsFactory $databaseParamsFactory,private InjectableFactory $injectableFactory,private Control $hookControl,+ #[Qualify(DataCache::QUALIFIER_SYSTEM)]+ private DataCache $systemDataCache,+ private DataCache $dataCache,) {}/**@@ -96,15 +102,30 @@ class DataManager* Clear cache.** @throws Error+ * @todo Trigger an inter-process event.*/public function clearCache(): void{$this->module->clearCache();+ try {+ $this->systemDataCache->clearAll();+ } catch (PersistenceError $e) {+ throw new Error("Could not clear system cache.", previous: $e);+ }++ if ($this->systemDataCache !== $this->dataCache) {+ try {+ $this->dataCache->clearAll();+ } catch (PersistenceError $e) {+ throw new Error("Could not clear application cache.", previous: $e);+ }+ }+$result = $this->fileManager->removeInDir($this->cachePath);if (!$result) {- throw new Error("Error while clearing cache");+ throw new Error("Error while clearing cache.");}$this->updateCacheTimestamp();diff --git a/application/Espo/Core/Utils/DataCache.php b/application/Espo/Core/Utils/DataCache.phpindex 7cd309ec62..ba308b0580 100644--- a/application/Espo/Core/Utils/DataCache.php+++ b/application/Espo/Core/Utils/DataCache.php@@ -145,6 +145,21 @@ class DataCache$this->pool->deleteItem($key);}+ /**+ * Clears all cache.+ *+ * @since 10.1.0+ * @throws PersistenceError+ */+ public function clearAll(): void+ {+ $result = $this->pool->clear();++ if ($result === false) {+ throw new PersistenceError("Could not clear cache.");+ }+ }+private function checkDataIsValid(mixed $data): bool{$isInvalid = !is_array($data) && !$data instanceof stdClass;