composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2249 - Supportability - Updater module

Browse Source
This commit is contained in:
Eric
2019-11-07 13:14:20 +01:00
parent 5e7ae930c5
commit da1684a8b9
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
setup/compiler.class.inc.php
View File

@@ -58,10 +58,13 @@ class MFCompiler
protected $sMainPHPCode; // Code that goes into core/main.php
protected $aSnippets;
protected $aRelations;
protected $sEnvironment;
public function __construct($oModelFactory)
public function __construct($oModelFactory, $sEnvironment)
{
$this->oFactory = $oModelFactory;
$this->sEnvironment = $sEnvironment;
$this->oFactory->ApplyChanges();
$this->aLog = array();
@@ -106,10 +109,15 @@ class MFCompiler
public function Compile($sTargetDir, $oP = null, $bUseSymbolicLinks = false, $bSkipTempDir = false)
{
$sFinalTargetDir = $sTargetDir;
$bIsAlreadyInMaintenanceMode = SetupUtils::IsInMaintenanceMode();
if ($bUseSymbolicLinks || $bSkipTempDir)
{
// Skip the creation of a temporary dictionary, not compatible with symbolic links
$sTempTargetDir = $sFinalTargetDir;
if (($this->sEnvironment == 'production') && !$bIsAlreadyInMaintenanceMode)
{
SetupUtils::EnterMaintenanceMode(new Config(utils::GetConfigFilePath($this->sEnvironment)));
}
}
else
{
@@ -137,9 +145,17 @@ class MFCompiler
if ($sTempTargetDir != $sFinalTargetDir)
{
// Move the results to the target directory
if (($this->sEnvironment == 'production') && !$bIsAlreadyInMaintenanceMode)
{
SetupUtils::EnterMaintenanceMode(new Config(utils::GetConfigFilePath($this->sEnvironment)));
}
SetupUtils::movedir($sTempTargetDir, $sFinalTargetDir);
}
if (($this->sEnvironment == 'production') && !$bIsAlreadyInMaintenanceMode)
{
SetupUtils::ExitMaintenanceMode();
}
// Reset the opcache since otherwise the PHP "model" files may still be cached !!
// In case of bad luck (this happens **sometimes** - see N. 550), we may analyze the database structure
// with the previous datamodel still loaded (in opcode cache) and thus fail to create the new fields