From b4e2b99c857fa8172ee03abb54807645597225c6 Mon Sep 17 00:00:00 2001 From: sam marshall Date: Fri, 15 Nov 2019 13:55:43 +0000 Subject: [PATCH] MDL-67274 Tasks: Log display fails with memory errors --- admin/classes/task_log_table.php | 3 ++- admin/tasklogs.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/classes/task_log_table.php b/admin/classes/task_log_table.php index 2bb892db2a4..949e757422e 100644 --- a/admin/classes/task_log_table.php +++ b/admin/classes/task_log_table.php @@ -131,7 +131,8 @@ class task_log_table extends \table_sql { } $sql = "SELECT - tl.*, + tl.id, tl.type, tl.component, tl.classname, tl.userid, tl.timestart, tl.timeend, + tl.dbreads, tl.dbwrites, tl.result, tl.dbreads + tl.dbwrites AS db, tl.timeend - tl.timestart AS duration, {$userfields} diff --git a/admin/tasklogs.php b/admin/tasklogs.php index 7820f60b2f4..0fb52069512 100644 --- a/admin/tasklogs.php +++ b/admin/tasklogs.php @@ -46,6 +46,8 @@ $logid = optional_param('logid', null, PARAM_INT); $download = optional_param('download', false, PARAM_BOOL); if (null !== $logid) { + // Raise memory limit in case the log is large. + raise_memory_limit(MEMORY_HUGE); $log = $DB->get_record('task_log', ['id' => $logid], '*', MUST_EXIST); if ($download) {