Clear cached app config while waiting for the SCSSCache to finish pro…

…cessing the file

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

lib/private/AppConfig.php

@@ -344,4 +344,14 @@ protected function loadConfigValues() {
 
 		$this->configLoaded = true;
 	}
+
+	/**
+	 * Clear all the cached app config values
+	 *
+	 * WARNING: do not use this - this is only for usage with the SCSSCacher to
+	 * clear the memory cache of the app config
+	 */
+	public function clearCachedConfig() {
+		$this->configLoaded = false;
+	}
 }

lib/private/Template/SCSSCacher.php

@@ -30,6 +30,7 @@
 
 namespace OC\Template;
 
+use OC\AppConfig;
 use OC\Files\AppData\Factory;
 use OC\Memcache\NullCache;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -89,6 +90,8 @@ class SCSSCacher {
 
 	/** @var IMemcache */
 	private $lockingCache;
+	/** @var AppConfig */
+	private $appConfig;
 
 	/**
 	 * @param ILogger $logger
@@ -109,7 +112,8 @@ public function __construct(ILogger $logger,
 								$serverRoot,
 								ICacheFactory $cacheFactory,
 								IconsCacher $iconsCacher,
-								ITimeFactory $timeFactory) {
+								ITimeFactory $timeFactory,
+								AppConfig $appConfig) {
 		$this->logger = $logger;
 		$this->appData = $appDataFactory->get('css');
 		$this->urlGenerator = $urlGenerator;
@@ -126,6 +130,7 @@ public function __construct(ILogger $logger,
 		$this->lockingCache = $lockingCache;
 		$this->iconsCacher = $iconsCacher;
 		$this->timeFactory = $timeFactory;
+		$this->appConfig = $appConfig;
 	}
 
 	/**
@@ -164,6 +169,7 @@ public function process(string $root, string $file, string $app): bool {
 			$retry = 0;
 			sleep(1);
 			while ($retry < 10) {
+				$this->appConfig->clearCachedConfig();
 				if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
 					// Inject icons vars css if any
 					$this->lockingCache->remove($lockKey);