From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 19 Jun 2020 12:39:31 +0000 (+0200)
Subject: Give up after 10 seconds in SCSS timeout
X-Git-Tag: v20.0.0beta1~396^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F21483%2Fhead;p=nextcloud-server.git

Give up after 10 seconds in SCSS timeout

Else we keep idling for ages which leads to bad UX

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---

diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index 427588ddddf..120ed585e16 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -171,7 +171,7 @@ class SCSSCacher {
 					return $this->injectCssVariablesIfAny();
 				}
 				$this->logger->debug('SCSSCacher: scss cache file locked for '.$lockKey, ['app' => 'core']);
-				sleep($retry);
+				sleep(1);
 				$retry++;
 			}
 			$this->logger->debug('SCSSCacher: Giving up scss caching for '.$lockKey, ['app' => 'core']);