From afe760a8bc5a6dfaeafefcc6ebbc1ba22cb9fd6f Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 1 Oct 2019 13:53:34 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02240=20-=20Supportability=20-=20Maintena?= =?UTF-8?q?nce=20mode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- approot.inc.php | 3 ++- setup/setuputils.class.inc.php | 4 ++-- webservices/cron.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/approot.inc.php b/approot.inc.php index 585ca3ba8..9cc48fe5e 100644 --- a/approot.inc.php +++ b/approot.inc.php @@ -3,6 +3,7 @@ define('APPROOT', dirname(__FILE__).'/'); define('APPCONF', APPROOT.'conf/'); define('ITOP_DEFAULT_ENV', 'production'); +define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance'); if (function_exists('microtime')) { @@ -23,7 +24,7 @@ if (!isset($bBypassMaintenance)) $bBypassMaintenance = isset($_REQUEST['maintenance']) ? boolval($_REQUEST['maintenance']) : false; } -if (file_exists(APPROOT.'.maintenance') && !$bBypassMaintenance) +if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance) { $sMessage = 'Application is currently in maintenance'; $sTitle = 'Maintenance'; diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 10a31acfd..f1f0941e3 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -1838,7 +1838,7 @@ EOF public final static function EnterMaintenanceMode($oConfig) { - @touch(APPROOT.'.maintenance'); + @touch(MAINTENANCE_MODE_FILE); SetupPage::log("----> Entering maintenance mode"); try { @@ -1872,7 +1872,7 @@ EOF public final static function ExitMaintenanceMode($bLog = true) { - @unlink(APPROOT.'.maintenance'); + @unlink(MAINTENANCE_MODE_FILE); if ($bLog) { SetupPage::log("<---- Exiting maintenance mode"); diff --git a/webservices/cron.php b/webservices/cron.php index 3a4288202..050a2cc3f 100644 --- a/webservices/cron.php +++ b/webservices/cron.php @@ -306,7 +306,7 @@ function CronExec($oP, $aProcesses, $bVerbose) } sleep($iCronSleep); // Maintenance mode - if (file_exists(APPROOT.'.maintenance')) + if (file_exists(MAINTENANCE_MODE_FILE)) { $oP->p("Maintenance mode detected"); return;