perf: cache server checks in local cache, not sessionperf/cache-server-checks-local-cache

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
index 87447af8adc..2d5dc8e25c8 100644
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@@ -304,6 +304,7 @@ class OC_Util {
 	 */
 	public static function checkServer(\OC\SystemConfig $config) {
 		$l = \OC::$server->getL10N('lib');
+		$localCache = \OCP\Server::get(\OCP\ICacheFactory::class)->createLocal('system');
 		$errors = [];
 		$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');
 
@@ -312,8 +313,8 @@ class OC_Util {
 			$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
 		}
 
-		// Assume that if checkServer() succeeded before in this session, then all is fine.
-		if (\OC::$server->getSession()->exists('checkServer_succeeded') && \OC::$server->getSession()->get('checkServer_succeeded')) {
+		// Skip re-evaluation if everything is fine
+		if ($localCache->get('checkServer_succeeded') === true) {
 			return $errors;
 		}
 
@@ -511,8 +512,8 @@ class OC_Util {
 			}
 		}
 
-		// Cache the result of this function
-		\OC::$server->getSession()->set('checkServer_succeeded', count($errors) == 0);
+		// Cache the result of this function for an hour
+		$localCache->set('checkServer_succeeded', $errors === [], 3600);
 
 		return $errors;
 	}