composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-22 00:32:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8806 - add log when loading MFModule

Browse Source
This commit is contained in:
odain
2026-04-09 16:31:44 +02:00
parent 3e57765607
commit 2adfd8552a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/extensionsmap.class.inc.php
View File

@@ -604,7 +604,7 @@ class iTopExtensionsMap
} }
} }
public function GetExtraDir(): array public function GetExtraDirs(): array
{ {
return $this->aExtraDirs; return $this->aExtraDirs;
} }

14
setup/modelfactory.class.inc.php
View File

@@ -1073,15 +1073,23 @@ class ModelFactory
*/ */
public function LoadModule(MFModule $oModule, $aLanguages = []) public function LoadModule(MFModule $oModule, $aLanguages = [])
{ {
$sRootDir = null;
$sModuleName = null;
$sModuleVersion = null;
try { try {
$aDataModels = $oModule->GetDataModelFiles(); $sRootDir = $oModule->GetRootDir();
$sModuleVersion = $oModule->GetVersion();
$sModuleName = $oModule->GetName(); $sModuleName = $oModule->GetName();
SetupLog::Debug("Loading module", null, [ $sModuleName, $sModuleVersion, $sRootDir]);
$aDataModels = $oModule->GetDataModelFiles();
self::$aLoadedModules[] = $oModule; self::$aLoadedModules[] = $oModule;
// For persistence in the cache // For persistence in the cache
$oModuleNode = $this->oDOMDocument->CreateElement('module'); $oModuleNode = $this->oDOMDocument->CreateElement('module');
$oModuleNode->setAttribute('id', $oModule->GetId()); $oModuleNode->setAttribute('id', $oModule->GetId());
$oModuleNode->appendChild($this->oDOMDocument->CreateElement('root_dir', $oModule->GetRootDir())); $oModuleNode->appendChild($this->oDOMDocument->CreateElement('root_dir', $sRootDir));
$oModuleNode->appendChild($this->oDOMDocument->CreateElement('label', $oModule->GetLabel())); $oModuleNode->appendChild($this->oDOMDocument->CreateElement('label', $oModule->GetLabel()));
$oModules = $this->oRoot->getElementsByTagName('loaded_modules')->item(0); $oModules = $this->oRoot->getElementsByTagName('loaded_modules')->item(0);
@@ -1170,7 +1178,7 @@ class ModelFactory
]); ]);
} }
} catch (Exception $e) { } catch (Exception $e) {
SetupLog::Exception(__METHOD__, $e); SetupLog::Exception("Cannot load module", $e, null, [ $sModuleName, $sModuleVersion, $sRootDir]);
$aLoadedModuleNames = []; $aLoadedModuleNames = [];
foreach (self::$aLoadedModules as $oLoadedModule) { foreach (self::$aLoadedModules as $oLoadedModule) {
$aLoadedModuleNames[] = $oLoadedModule->GetName().':'.$oLoadedModule->GetVersion(); $aLoadedModuleNames[] = $oLoadedModule->GetName().':'.$oLoadedModule->GetVersion();