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/2.7' into support/3.0

Browse Source 
# Conflicts:
#	core/config.class.inc.php
This commit is contained in:
Eric Espie
2023-07-19 15:19:06 +02:00
parent 00b070b3cf 4d8246c4d8
commit 046e857768
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ class ExecutionKPI
static protected $m_bEnabled_Memory = false;
static protected $m_bBlameCaller = false;
static protected $m_sAllowedUser = '*';
static protected $m_bReportExtensionsOnly = false;
static protected $m_bGenerateLegacyReport = true;
static protected $m_fSlowQueries = 0;
static protected $m_aStats = []; // Recurrent operations
@@ -75,9 +75,9 @@ class ExecutionKPI
return false;
}
static public function SetReportExtensionsOnly($bReportExtensionsOnly)
static public function SetGenerateLegacyReport($bReportExtensionsOnly)
{
self::$m_bReportExtensionsOnly = $bReportExtensionsOnly;
self::$m_bGenerateLegacyReport = $bReportExtensionsOnly;
}
static public function SetSlowQueries($fSlowQueries)
@@ -134,7 +134,7 @@ class ExecutionKPI
}
}
if (self::$m_bReportExtensionsOnly) {
if (!self::$m_bGenerateLegacyReport) {
return;
}
@@ -397,7 +397,7 @@ class ExecutionKPI
}
}
if (!is_null($aNewEntry) && !self::$m_bReportExtensionsOnly)
if (!is_null($aNewEntry) && self::$m_bGenerateLegacyReport)
{
self::$m_aExecData[] = $aNewEntry;
}
@@ -427,7 +427,7 @@ class ExecutionKPI
$fStopped = MyHelpers::getmicrotime();
$fDuration = $fStopped - $this->m_fStarted;
$aCallstack = [];
if (!self::$m_bReportExtensionsOnly) {
if (self::$m_bGenerateLegacyReport) {
if (self::$m_bBlameCaller) {
$aCallstack = MyHelpers::get_callstack(1);
self::$m_aStats[$sOperation][$sArguments][] = [