L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sara Arjona
2022-09-14 11:41:53 +02:00
parent 0561f8c5b5 f8351de05e
commit 53846820df
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config-dist.php
+3
View File
@@ -409,6 +409,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:
lib/classes/shutdown_manager.php
+3 -3
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) {
lib/outputrenderers.php
+2 -2
View File
@@ -1435,9 +1435,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'];
}
}