diff --git a/core/config.class.inc.php b/core/config.class.inc.php index f9eb40627..ddcb542b0 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -1069,10 +1069,10 @@ class Config 'source_of_value' => '', 'show_in_conf_sample' => false, ], - 'log_kpi_report_to_extensions_only' => [ + 'log_kpi_generate_legacy_report' => [ 'type' => 'bool', - 'description' => 'Report only the KPI logging extensions', - 'default' => false, + 'description' => 'Generate the legacy KPI report (kpi.html)', + 'default' => true, 'value' => '', 'source_of_value' => '', 'show_in_conf_sample' => false, diff --git a/core/kpi.class.inc.php b/core/kpi.class.inc.php index 053f0e570..499470103 100644 --- a/core/kpi.class.inc.php +++ b/core/kpi.class.inc.php @@ -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][] = [ diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 4b00f4df6..d9330ef12 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -6377,7 +6377,7 @@ abstract class MetaModel ExecutionKPI::EnableDuration(self::$m_oConfig->Get('log_kpi_duration')); ExecutionKPI::EnableMemory(self::$m_oConfig->Get('log_kpi_memory')); ExecutionKPI::SetAllowedUser(self::$m_oConfig->Get('log_kpi_user_id')); - ExecutionKPI::SetReportExtensionsOnly(self::$m_oConfig->Get('log_kpi_report_to_extensions_only')); + ExecutionKPI::SetGenerateLegacyReport(self::$m_oConfig->Get('log_kpi_generate_legacy_report')); ExecutionKPI::SetSlowQueries(self::$m_oConfig->Get('log_kpi_slow_queries')); self::$m_bSkipCheckToWrite = self::$m_oConfig->Get('skip_check_to_write');