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

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	core/kpi.class.inc.php
This commit is contained in:
Eric Espie
2023-07-19 10:44:22 +02:00
parent 89145593ef 2c4cad4dac
commit 00b070b3cf
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/kpi.class.inc.php
View File

@@ -1,29 +1,14 @@
<?php <?php
// Copyright (C) 2010-2021 Combodo SARL /**
// * @copyright Copyright (C) 2010-2023 Combodo SARL
// This file is part of iTop. * @license http://opensource.org/licenses/AGPL-3.0
// */
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
use Combodo\iTop\Core\Kpi\KpiLogData; use Combodo\iTop\Core\Kpi\KpiLogData;
use Combodo\iTop\Service\Module\ModuleService; use Combodo\iTop\Service\Module\ModuleService;
/** /**
* Measures operations duration, memory usage, etc. (and some other KPIs) * Measures operations duration, memory usage, etc. (and some other KPIs)
*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/ */
class ExecutionKPI class ExecutionKPI
@@ -355,6 +340,10 @@ class ExecutionKPI
{ {
global $fItopStarted; global $fItopStarted;
if (!self::IsEnabled()) {
return;
}
$aNewEntry = null; $aNewEntry = null;
$fStarted = $this->m_fStarted; $fStarted = $this->m_fStarted;
@@ -417,6 +406,10 @@ class ExecutionKPI
public function ComputeStatsForExtension($object, $sMethod) public function ComputeStatsForExtension($object, $sMethod)
{ {
if (!self::IsEnabled()) {
return;
}
$sSignature = ModuleService::GetInstance()->GetModuleMethodSignature($object, $sMethod); $sSignature = ModuleService::GetInstance()->GetModuleMethodSignature($object, $sMethod);
if (utils::StartsWith($sSignature, '[')) { if (utils::StartsWith($sSignature, '[')) {
$this->ComputeStats('Extension', $sSignature); $this->ComputeStats('Extension', $sSignature);
@@ -425,6 +418,10 @@ class ExecutionKPI
public function ComputeStats($sOperation, $sArguments) public function ComputeStats($sOperation, $sArguments)
{ {
if (!self::IsEnabled()) {
return;
}
$fDuration = 0; $fDuration = 0;
if (self::$m_bEnabled_Duration) { if (self::$m_bEnabled_Duration) {
$fStopped = MyHelpers::getmicrotime(); $fStopped = MyHelpers::getmicrotime();