From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 15 Oct 2020 21:48:26 +0000 (+0200)
Subject: SCSSCacher - Lock should not be removed
X-Git-Tag: v21.0.0beta1~390^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=927343653447461cd4e6d869e8abfd40a70a4bd0;p=nextcloud-server.git

SCSSCacher - Lock should not be removed

This is within the failed lock acquiring branch. So the lock is free by another process and should not be removed because the cached file (that was created by the process having the lock) appeared on the filesystem.

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

diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index 08400fd8c72..d2c04a4a85a 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -169,7 +169,6 @@ class SCSSCacher {
 				$this->logger->debug('SCSSCacher::process check in while loop follows', ['app' => 'scss_cacher']);
 				if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
 					// Inject icons vars css if any
-					$this->lockingCache->remove($lockKey);
 					$this->logger->debug("SCSSCacher::process cached file for app '$app' and file '$fileNameCSS' is now available after $retry s. Moving on...", ['app' => 'scss_cacher']);
 					return $this->injectCssVariablesIfAny();
 				}