From b239e822ef54c83a76e81b4784f17cc6b206f3c4 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Tue, 7 Sep 2021 10:54:27 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B04227=20/=20N=C2=B04225=20-=20Check=20cro?= =?UTF-8?q?n=20context=20in=20WaitCronTermination?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup/setuputils.class.inc.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index eb6d22823..56faff49e 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -2016,9 +2016,7 @@ JS $bPreviousMode = self::IsInReadOnlyMode(); @touch(READONLY_MODE_FILE); self::Log("----> Entering read only mode"); - if (!ContextTag::Check(ContextTag::TAG_CRON)) { - self::WaitCronTermination($oConfig, "read only"); - } + self::WaitCronTermination($oConfig, "read only"); return $bPreviousMode; } @@ -2046,8 +2044,7 @@ JS try { // Wait for cron to stop - if (is_null($oConfig)) - { + if (is_null($oConfig) || ContextTag::Check(ContextTag::TAG_CRON)) { return; } // Use mutex to check if cron is running