moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-74010-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE

Browse source
This commit is contained in:
Sara Arjona 2022-09-14 11:41:47 +02:00
commit 49705b1f40
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config-dist.php
View file

@ -413,6 +413,9 @@ $CFG->admin = 'admin';
// Print to footer (works with the default theme) // Print to footer (works with the default theme)
// define('MDL_PERFTOFOOT', true); // 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 // Enable earlier profiling that causes more code to be covered
// on every request (db connections, config load, other inits...). // on every request (db connections, config load, other inits...).
// Requires extra configuration to be defined in config.php like: // 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. // 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) { if ($apachereleasemem) {
error_log('Mem usage over '.$apachereleasemem.': marking Apache child for reaping.'); 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(); $perf = get_performance_info();
error_log("PERF: " . $perf['txt']); error_log("PERF: " . $perf['txt']);
} }
if (defined('MDL_PERFINC')) { if (defined('MDL_PERFINC') && MDL_PERFINC) {
$inc = get_included_files(); $inc = get_included_files();
$ts = 0; $ts = 0;
foreach ($inc as $f) { foreach ($inc as $f) {

4
lib/outputrenderers.php
View file

@ -1507,9 +1507,9 @@ class core_renderer extends renderer_base {
// Provide some performance info if required // Provide some performance info if required
$performanceinfo = ''; $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(); $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']; $performanceinfo = $perf['html'];
} }
} }