composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.1' into develop

Browse Source 
# Conflicts:
#	sources/Service/Events/EventService.php
This commit is contained in:
Molkobain
2023-11-13 15:24:47 +01:00
parent d5f054b739 eb7c971091
commit 770bf4c42a
30 changed files with 355 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/Service/Events/EventService.php
View File

@@ -161,13 +161,13 @@ final class EventService
try {
$oEventData->SetCallbackData($aEventCallback['data']);
$oKPI = new ExecutionKPI();
call_user_func($aEventCallback['callback'], $oEventData);
$sArguments = "Event: $sEvent";
if (utils::IsNotNullOrEmptyString($aEventCallback['module'])) {
$sArguments .= ' ['.$aEventCallback['module'].']';
if (is_array($aEventCallback['callback']) && !$oKPI->ComputeStatsForExtension($aEventCallback['callback'][0], $aEventCallback['callback'][1], "Event: $sEvent")) {
$sSignature = ModuleService::GetInstance()->GetModuleMethodSignature($aEventCallback['callback'][0], $aEventCallback['callback'][1]);
$oKPI->ComputeStats('FireEvent', "$sEvent callback: $sSignature");
}
$sArguments .= ' '.$aEventCallback['name'].'()';
$oKPI->ComputeStats('Extension', $sArguments);
}
catch (EventException $e) {
EventServiceLog::Error("Event '$sLogEventName' for '$sName' id {$aEventCallback['id']} failed with blocking error: ".$e->getMessage());