From 2adfd8552a468580a855a9c1fd3dcba8ee0909d9 Mon Sep 17 00:00:00 2001 From: odain Date: Thu, 9 Apr 2026 16:31:44 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B08806=20-=20add=20log=20when=20loading=20?= =?UTF-8?q?MFModule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup/extensionsmap.class.inc.php | 2 +- setup/modelfactory.class.inc.php | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/setup/extensionsmap.class.inc.php b/setup/extensionsmap.class.inc.php index 7577f627b8..8c240f9fc9 100644 --- a/setup/extensionsmap.class.inc.php +++ b/setup/extensionsmap.class.inc.php @@ -604,7 +604,7 @@ class iTopExtensionsMap } } - public function GetExtraDir(): array + public function GetExtraDirs(): array { return $this->aExtraDirs; } diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php index 02f629e5d8..f07fe47305 100644 --- a/setup/modelfactory.class.inc.php +++ b/setup/modelfactory.class.inc.php @@ -1073,15 +1073,23 @@ class ModelFactory */ public function LoadModule(MFModule $oModule, $aLanguages = []) { + $sRootDir = null; + $sModuleName = null; + $sModuleVersion = null; + try { - $aDataModels = $oModule->GetDataModelFiles(); + $sRootDir = $oModule->GetRootDir(); + $sModuleVersion = $oModule->GetVersion(); $sModuleName = $oModule->GetName(); + SetupLog::Debug("Loading module", null, [ $sModuleName, $sModuleVersion, $sRootDir]); + $aDataModels = $oModule->GetDataModelFiles(); + self::$aLoadedModules[] = $oModule; // For persistence in the cache $oModuleNode = $this->oDOMDocument->CreateElement('module'); $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())); $oModules = $this->oRoot->getElementsByTagName('loaded_modules')->item(0); @@ -1170,7 +1178,7 @@ class ModelFactory ]); } } catch (Exception $e) { - SetupLog::Exception(__METHOD__, $e); + SetupLog::Exception("Cannot load module", $e, null, [ $sModuleName, $sModuleVersion, $sRootDir]); $aLoadedModuleNames = []; foreach (self::$aLoadedModules as $oLoadedModule) { $aLoadedModuleNames[] = $oLoadedModule->GetName().':'.$oLoadedModule->GetVersion();