mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-74010 core: check defined MDL_PERF* values in conditionals.

Browse Source
This commit is contained in:
Paul Holden 2022-02-25 20:55:06 +00:00
parent 35b993b694
commit a65476d590
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config-dist.php
View File

@ -415,6 +415,9 @@ $CFG->admin = 'admin';
// Print to footer (works with the default theme)
// define('MDL_PERFTOFOOT', true);
//
// Print additional data to log of included files
// define('MDL_PERFINC', true);
//
// Enable earlier profiling that causes more code to be covered
// on every request (db connections, config load, other inits...).
// Requires extra configuration to be defined in config.php like:

6
lib/classes/shutdown_manager.php
View File

@ -204,15 +204,15 @@ class core_shutdown_manager {
}
// Deal with perf logging.
if (defined('MDL_PERF') || (!empty($CFG->perfdebug) and $CFG->perfdebug > 7)) {
if ((defined('MDL_PERF') && MDL_PERF) || (!empty($CFG->perfdebug) && $CFG->perfdebug > 7)) {
if ($apachereleasemem) {
error_log('Mem usage over '.$apachereleasemem.': marking Apache child for reaping.');
}
if (defined('MDL_PERFTOLOG')) {
if (defined('MDL_PERFTOLOG') && MDL_PERFTOLOG) {
$perf = get_performance_info();
error_log("PERF: " . $perf['txt']);
}
if (defined('MDL_PERFINC')) {
if (defined('MDL_PERFINC') && MDL_PERFINC) {
$inc = get_included_files();
$ts = 0;
foreach ($inc as $f) {

4
lib/outputrenderers.php
View File

@ -1504,9 +1504,9 @@ class core_renderer extends renderer_base {
// Provide some performance info if required
$performanceinfo = '';
if (defined('MDL_PERF') || (!empty($CFG->perfdebug) and $CFG->perfdebug > 7)) {
if ((defined('MDL_PERF') && MDL_PERF) || (!empty($CFG->perfdebug) && $CFG->perfdebug > 7)) {
$perf = get_performance_info();
if (defined('MDL_PERFTOFOOT') || debugging() || $CFG->perfdebug > 7) {
if ((defined('MDL_PERFTOFOOT') && MDL_PERFTOFOOT) || debugging() || $CFG->perfdebug > 7) {
$performanceinfo = $perf['html'];
}
}