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

Merge branch 'MDL-70975-adhoc-carneval' of https://github.com/catalyst/moodle

Browse Source
This commit is contained in:
Ilya Tregubov
2023-04-13 09:07:58 +08:00
parent e450756ce1 85323070e7
commit cfbb0ea4d5
14 changed files with 973 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/task/adhoctasks.php
+60
View File
@@ -0,0 +1,60 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Ad hoc task list.
*
* @package tool_task
* @copyright Catalyst IT
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once(__DIR__ . '/../../../config.php');
require_once($CFG->libdir.'/adminlib.php');
admin_externalpage_setup('adhoctasks');
$failedonly = optional_param('failedonly', false, PARAM_BOOL);
$classname = optional_param('classname', null, PARAM_RAW);
$renderer = $PAGE->get_renderer('tool_task');
if ($classname) {
$pageurl = new moodle_url('/admin/tool/task/adhoctasks.php');
$PAGE->navbar->add(get_string('adhoctasks', 'tool_task'), $pageurl);
$PAGE->navbar->add($classname, $PAGE->url);
$tasks = core\task\manager::get_adhoc_tasks($classname, $failedonly);
echo $OUTPUT->header();
if (!get_config('core', 'cron_enabled')) {
echo $renderer->cron_disabled();
}
echo $renderer->adhoc_tasks_class_table($classname, $tasks, ['failedonly' => $failedonly]);
} else {
$summary = core\task\manager::get_adhoc_tasks_summary();
echo $OUTPUT->header();
if (!get_config('core', 'cron_enabled')) {
echo $renderer->cron_disabled();
}
echo $renderer->adhoc_tasks_summary_table($summary);
}
echo $OUTPUT->footer();
admin/tool/task/lang/en/tool_task.php
+21
View File
@@ -24,11 +24,17 @@
$string['adhoc'] = 'Ad hoc';
$string['adhoctaskid'] = 'Ad hoc task ID: {$a}';
$string['adhoctaskrun'] = 'Ad hoc task run initiated';
$string['adhoctasks'] = 'Ad hoc tasks';
$string['adhoctasksdue'] = 'Ad hoc tasks due';
$string['adhoctasksfailed'] = 'Ad hoc tasks failed';
$string['adhoctasksfuture'] = 'Future ad hoc tasks';
$string['adhoctasksrunning'] = 'Ad hoc tasks running';
$string['asap'] = 'ASAP';
$string['adhocempty'] = 'Ad hoc task queue is empty';
$string['adhocqueuesize'] = 'Ad hoc task queue has {$a} tasks';
$string['adhocqueueold'] = 'Oldest unprocessed task is {$a->age}, which is more than {$a->max}';
$string['backtoadhoctasks'] = 'Back to ad hoc tasks';
$string['backtoscheduledtasks'] = 'Back to scheduled tasks';
$string['blocking'] = 'Blocking';
$string['cannotfindthepathtothecli'] = 'Cannot find the path to the PHP CLI executable so task execution aborted. Set the \'Path to PHP CLI\' setting in Site administration / Server / System paths.';
@@ -51,31 +57,46 @@ $string['edittaskschedule'] = 'Edit task schedule: {$a}';
$string['enablerunnow'] = 'Allow \'Run now\' for scheduled tasks';
$string['enablerunnow_desc'] = 'Allows administrators to run a single scheduled task immediately, rather than waiting for it to run as scheduled. The feature requires \'Path to PHP CLI\' (pathtophp) to be set in System paths. The task runs on the web server, so you may wish to disable this feature to avoid potential performance issues.';
$string['faildelay'] = 'Fail delay';
$string['failed'] = 'Failed';
$string['fromcomponent'] = 'From component: {$a}';
$string['hostname'] = 'Host name';
$string['lastcronstart'] = 'Time since last cron run: {$a}';
$string['lastruntime'] = 'Last run';
$string['lastupdated'] = 'Last updated {$a}.';
$string['nextruntime'] = 'Next run';
$string['noclassname'] = 'Class name not specified';
$string['notasks'] = 'No tasks to run';
$string['payload'] = 'Payload';
$string['pid'] = 'PID';
$string['plugindisabled'] = 'Plugin disabled';
$string['pluginname'] = 'Scheduled task configuration';
$string['resettasktodefaults'] = 'Reset task schedule to defaults';
$string['resettasktodefaults_help'] = 'This will discard any local changes and revert the schedule for this task back to its original settings.';
$string['run_adhoctasks'] = 'Run ad hoc tasks';
$string['runningalltasks'] = 'Running all tasks';
$string['runningfailedtasks'] = 'Running failed tasks';
$string['runningtasks'] = 'Tasks running now';
$string['runnow'] = 'Run now';
$string['runagain'] = 'Run again';
$string['runadhoc_confirm'] = 'Tasks will run on the web server and may take some time to complete.';
$string['runadhoc'] = 'Run ad hoc tasks now?';
$string['runnow_confirm'] = 'Are you sure you want to run this task \'{$a}\' now? The task will run on the web server and may take some time to complete.';
$string['runclassname'] = 'Run all';
$string['runclassnamefailedonly'] = 'Run all failed';
$string['runpattern'] = 'Run pattern';
$string['scheduled'] = 'Scheduled';
$string['scheduledtasks'] = 'Scheduled tasks';
$string['scheduledtaskchangesdisabled'] = 'Modifications to the list of scheduled tasks have been prevented in Moodle configuration';
$string['slowtask'] = 'Task has run for longer than {$a}';
$string['showall'] = 'Show all';
$string['showfailedonly'] = 'Show failed only';
$string['showsummary'] = 'Show ad hoc tasks summary';
$string['started'] = 'Started';
$string['taskage'] = 'Run time';
$string['taskdetails'] = 'Tasks running for more than {$a->time} (max {$a->maxtime}): {$a->count}';
$string['taskdisabled'] = 'Task disabled';
$string['taskfailures'] = '{$a} task(s) failing';
$string['taskid'] = 'Task ID';
$string['tasklogs'] = 'Task logs';
$string['tasknofailures'] = 'There are no tasks failing';
$string['taskrunningtime'] = 'Task has run for {$a}';
admin/tool/task/lib.php
+9
View File
@@ -38,3 +38,12 @@ function tool_task_status_checks() : array {
];
}
/**
* Function used to handle mtrace by outputting the text to normal browser window.
*
* @param string $message Message to output
* @param string $eol End of line character
*/
function tool_task_mtrace_wrapper(string $message, string $eol): void {
echo s($message . $eol);
}
admin/tool/task/renderer.php
+280 -3
View File
@@ -35,6 +35,279 @@ use core\task\scheduled_task;
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_task_renderer extends plugin_renderer_base {
/**
* This function will render a table with the summary of all adhoc tasks.
*
* @param array $summary
* @return string HTML to output.
*/
public function adhoc_tasks_summary_table(array $summary): string {
$adhocurl = '/admin/tool/task/adhoctasks.php';
$adhocrunurl = '/admin/tool/task/run_adhoctasks.php';
// Main tasks table.
$table = new html_table();
$table->caption = get_string('adhoctasks', 'tool_task');
$table->head = [
get_string('component', 'tool_task') . ' / ' . get_string('classname', 'tool_task'),
get_string('adhoctasksrunning', 'tool_task'),
get_string('adhoctasksdue', 'tool_task'),
get_string('adhoctasksfuture', 'tool_task'),
get_string('adhoctasksfailed', 'tool_task'),
get_string('nextruntime', 'tool_task'),
];
$table->attributes['class'] = 'admintable generaltable';
$table->colclasses = [];
// For each task entry (row) show action buttons/logs link depending on the user permissions.
$data = [];
$canruntasks = \core\task\manager::is_runnable() && get_config('tool_task', 'enablerunnow');
foreach ($summary as $component => $classes) {
// Component cell.
$componentcell = new html_table_cell($component);
$componentcell->header = true;
$componentcell->id = "tasks-$component";
$componentcell->colspan = 6;
$data[] = new html_table_row([$componentcell]);
foreach ($classes as $classname => $stats) {
// Task class cell.
$classbits = explode('\\', $classname);
$classcontent = html_writer::link(
new moodle_url($adhocurl, ['classname' => $classname]),
end($classbits)
);
$classcell = new html_table_cell($classcontent);
$classcell->header = true;
$classcell->class = "task-class-summary text-ltr";
$duecontent = $stats['due'];
if ($canruntasks && ($stats['due'] > 0 || $stats['failed'] > 0)) {
$duecontent .= html_writer::div(
html_writer::link(
new moodle_url(
$adhocrunurl,
['classname' => $classname]
),
get_string('runclassname', 'tool_task')
),
'task-runnow'
);
}
// Mark cell if has failed tasks.
$failed = $stats['failed'];
if ($canruntasks && $failed > 0) {
$failed .= html_writer::div(
html_writer::link(
new moodle_url(
$adhocrunurl,
['classname' => $classname, 'failedonly' => 1]
),
get_string('runclassnamefailedonly', 'tool_task')
),
'task-runnow'
);
}
$failedcell = new html_table_cell($failed);
if ($failed > 0) {
$failedcell->attributes['class'] = 'table-danger';
}
// Prepares the next run time cell contents.
$nextrun = '';
if ($stats['due'] > 0) {
$nextrun = get_string('asap', 'tool_task');
} else if ($stats['nextruntime']) {
$nextrun = userdate($stats['nextruntime']);
}
$data[] = new html_table_row([
$classcell,
new html_table_cell($stats['running']),
new html_table_cell($duecontent),
new html_table_cell($stats['count'] - $stats['running'] - $stats['due']),
$failedcell,
new html_table_cell($nextrun),
]);
}
}
$table->data = $data;
return html_writer::table($table);
}
/**
* This function will render a table with all the adhoc tasks for the class.
*
* @param string $classname
* @param array $tasks - list of all adhoc tasks.
* @param array|null $params
* @return string HTML to output.
*/
public function adhoc_tasks_class_table(string $classname, array $tasks, ?array $params = []): string {
$adhocurl = '/admin/tool/task/adhoctasks.php';
$adhocrunurl = '/admin/tool/task/run_adhoctasks.php';
$showloglink = \core\task\logmanager::has_log_report();
$failedonly = !empty($params['failedonly']);
$canruntasks = \core\task\manager::is_runnable() && get_config('tool_task', 'enablerunnow');
// Depending on the currently set parameters, set up toggle buttons.
$failedorall = html_writer::link(
new moodle_url(
$adhocurl,
array_merge($params, ['classname' => $classname, 'failedonly' => !$failedonly])
),
get_string($failedonly ? 'showall' : 'showfailedonly', 'tool_task')
);
// Main tasks table.
$table = $this->generate_adhoc_tasks_simple_table($tasks, $canruntasks);
$table->caption = "$classname "
. get_string($failedonly ? 'adhoctasksfailed' : 'adhoctasks', 'tool_task');
$table->head[3] .= " $failedorall"; // Spice up faildelay heading.
if ($showloglink) {
// Insert logs as the second col.
array_splice($table->head, 1, 0, [get_string('logs')]);
array_walk($table->data, function ($row, $idx) use ($classname) {
$loglink = '';
$faildelaycell = $row->cells[3];
if ($faildelaycell->attributes['class'] == 'table-danger') {
// Failed task.
$loglink = $this->output->action_icon(
\core\task\logmanager::get_url_for_task_class($classname),
new pix_icon('e/file-text', get_string('viewlogs', 'tool_task', $classname)
));
}
array_splice($row->cells, 1, 0, [new html_table_cell($loglink)]);
});
}
return html_writer::table($table)
. html_writer::div(
html_writer::link(
new moodle_url(
$adhocrunurl,
array_merge($params, ['classname' => $classname])
),
get_string('runclassname', 'tool_task')
),
'task-runnow'
)
. html_writer::div(
html_writer::link(
new moodle_url(
$adhocurl
),
get_string('showsummary', 'tool_task')
),
'task-show-summary'
);
}
/**
* This function will render a plain adhoc tasks table.
*
* @param array $tasks - list of adhoc tasks.
* @return string HTML to output.
*/
public function adhoc_tasks_simple_table(array $tasks): string {
$table = $this->generate_adhoc_tasks_simple_table($tasks);
return html_writer::table($table);
}
/**
* This function will render a plain adhoc tasks table.
*
* @param array $tasks - list of adhoc tasks.
* @param bool $wantruntasks add 'Run now' link
* @return html_table
*/
private function generate_adhoc_tasks_simple_table(array $tasks, bool $wantruntasks = false): html_table {
$adhocrunurl = '/admin/tool/task/run_adhoctasks.php';
$now = time();
$failedstr = get_string('failed', 'tool_task');
// Main tasks table.
$table = new html_table();
$table->caption = get_string('adhoctasks', 'tool_task');
$table->head = [
get_string('taskid', 'tool_task'),
get_string('nextruntime', 'tool_task'),
get_string('payload', 'tool_task'),
$failedstr
];
$table->attributes['class'] = 'generaltable';
$table->colclasses = [];
// For each task entry (row) show action buttons/logs link depending on the user permissions.
$data = [];
foreach ($tasks as $task) {
$taskid = $task->get_id();
$started = $task->get_timestarted();
// Task id cell.
$taskidcellcontent = html_writer::span($taskid, 'task-id');
$taskidcell = new html_table_cell($taskidcellcontent);
$taskidcell->header = true;
$taskidcell->id = "task-$taskid";
// Mark cell if task has failed.
$faildelay = $task->get_fail_delay();
$faildelaycell = new html_table_cell($faildelay ? $failedstr : '');
if ($faildelay) {
$faildelaycell->attributes['class'] = 'table-danger';
}
// Prepares the next run time cell contents.
$nextrun = get_string('started', 'tool_task');
if (!$started) {
$nextruntime = $task->get_next_run_time();
$due = $nextruntime < $now;
$nextrun = $due ? userdate($nextruntime) : get_string('asap', 'tool_task');
if ($wantruntasks && ($faildelay || $due)) {
$nextrun .= ' '.html_writer::div(
html_writer::link(
new moodle_url(
$adhocrunurl,
['id' => $taskid]
),
get_string('runnow', 'tool_task')
),
'task-runnow'
);
}
}
$data[] = new html_table_row([
$taskidcell,
new html_table_cell($nextrun),
new html_table_cell($task->get_custom_data_as_string()),
$faildelaycell,
]);
}
$table->data = $data;
return $table;
}
/**
* Displays a notification on ad hoc task run request.
*
* @return string HTML notification block for task initiated message
*/
public function adhoc_task_run(): string {
return $this->output->notification(get_string('adhoctaskrun', 'tool_task'), 'info');
}
/**
* This function will render one beautiful table with all the scheduled tasks.
*
@@ -121,10 +394,14 @@ class tool_task_renderer extends plugin_renderer_base {
$faildelaycell = new html_table_cell($task->get_fail_delay());
if ($task->get_fail_delay()) {
$faildelaycell->text .= html_writer::div(html_writer::link(
$faildelaycell->text .= html_writer::div(
$this->output->single_button(
new moodle_url('/admin/tool/task/clear_fail_delay.php',
['task' => $classname, 'sesskey' => sesskey()]),
get_string('clear')), 'task-clearfaildelay');
['task' => $classname]),
get_string('clear')
),
'task-runnow'
);
$faildelaycell->attributes['class'] = 'table-danger';
}
admin/tool/task/run_adhoctasks.php
+157
View File
@@ -0,0 +1,157 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Web run ad hoc task(s)
*
* This script runs a group or a single ad hoc task from the web UI.
*
* @package tool_task
* @copyright Catalyst IT
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define('NO_OUTPUT_BUFFERING', true);
require_once(__DIR__ . '/../../../config.php');
require_once($CFG->libdir.'/adminlib.php');
admin_externalpage_setup('adhoctasks');
$runurl = '/admin/tool/task/run_adhoctasks.php';
$tasksurl = '/admin/tool/task/adhoctasks.php';
// Allow execution of single task. This requires login and has different rules.
$classname = optional_param('classname', null, PARAM_RAW);
$failedonly = optional_param('failedonly', false, PARAM_BOOL);
$taskid = optional_param('id', null, PARAM_INT);
$confirmed = optional_param('confirm', 0, PARAM_INT);
if (!\core\task\manager::is_runnable()) {
$redirecturl = new \moodle_url('/admin/settings.php', ['section' => 'systempaths']);
throw new moodle_exception('cannotfindthepathtothecli', 'tool_task', $redirecturl->out());
}
$params = ['classname' => $classname, 'failedonly' => $failedonly, 'id' => $taskid];
// Check input parameter id against all existing tasks.
if ($taskid) {
$record = $DB->get_record('task_adhoc', ['id' => $taskid]);
if (!$record) {
throw new \moodle_exception('invalidtaskid');
}
$classname = $record->classname;
$heading = "Run $classname task Id $taskid";
$tasks = [core\task\manager::adhoc_task_from_record($record)];
} else {
if (!$classname) {
throw new \moodle_exception('noclassname', 'tool_task');
}
$heading = "Run $classname " . ($failedonly ? "failed" : "all")." tasks";
$now = time();
$tasks = array_filter(
core\task\manager::get_adhoc_tasks($classname, $failedonly, true),
function ($t) use ($now) {
return $t->get_fail_delay() || $t->get_next_run_time() <= $now;
}
);
}
// Start output.
$context = context_system::instance();
$PAGE->set_context($context);
$PAGE->set_heading($SITE->fullname);
$PAGE->set_title($classname);
echo $OUTPUT->header();
echo $OUTPUT->heading($heading);
if (!$tasks) {
echo $OUTPUT->single_button($tasksurl,
get_string('notasks', 'tool_task'),
'get');
echo $OUTPUT->footer();
exit;
}
$renderer = $PAGE->get_renderer('tool_task');
if (!get_config('core', 'cron_enabled')) {
echo $renderer->cron_disabled();
}
echo $renderer->adhoc_tasks_simple_table($tasks);
// The initial request just shows the confirmation page; we don't do anything further unless
// they confirm.
if (!$confirmed) {
echo $OUTPUT->confirm(get_string('runadhoc_confirm', 'tool_task'),
new single_button(new moodle_url($runurl, array_merge($params, ['confirm' => 1])),
get_string('runadhoc', 'tool_task')),
new single_button(new moodle_url($tasksurl, $params),
get_string('cancel'), false));
echo $OUTPUT->footer();
exit;
}
// Action requires session key.
require_sesskey();
\core\session\manager::write_close();
// Prepare to handle output via mtrace.
$CFG->mtrace_wrapper = 'tool_task_mtrace_wrapper';
// Run the specified tasks.
if ($taskid) {
$repeat = $DB->get_record('task_adhoc', ['id' => $taskid]);
echo html_writer::start_tag('pre');
\core\task\manager::run_adhoc_from_cli($taskid);
echo html_writer::end_tag('pre');
} else {
$repeat = core\task\manager::get_adhoc_tasks($classname, $failedonly, true);
// Run failed first (if any). We have to run them separately anyway,
// because faildelay is observed if failed flag is not true.
echo html_writer::tag('p', get_string('runningfailedtasks', 'tool_task'), ['class' => 'lead']);
echo html_writer::start_tag('pre');
\core\task\manager::run_all_adhoc_from_cli(true, $classname);
echo html_writer::end_tag('pre');
if (!$failedonly) {
echo html_writer::tag('p', get_string('runningalltasks', 'tool_task'), ['class' => 'lead']);
echo html_writer::start_tag('pre');
\core\task\manager::run_all_adhoc_from_cli(false, $classname);
echo html_writer::end_tag('pre');
}
}
if ($repeat) {
echo html_writer::div(
$OUTPUT->single_button(
new moodle_url($runurl, array_merge($params, ['confirm' => 1])),
get_string('runagain', 'tool_task')
)
);
}
echo html_writer::div(
html_writer::link(
new moodle_url($tasksurl, $taskid ? ['classname' => $classname] : []),
get_string('backtoadhoctasks', 'tool_task')
)
);
echo $OUTPUT->footer();
admin/tool/task/schedule_task.php
-10
View File
@@ -28,16 +28,6 @@ define('NO_OUTPUT_BUFFERING', true);
require('../../../config.php');
/**
* Function used to handle mtrace by outputting the text to normal browser window.
*
* @param string $message Message to output
* @param string $eol End of line character
*/
function tool_task_mtrace_wrapper($message, $eol) {
echo s($message . $eol);
}
// Allow execution of single task. This requires login and has different rules.
$taskname = required_param('task', PARAM_RAW_TRIMMED);
admin/tool/task/settings.php
+9
View File
@@ -34,6 +34,15 @@ if ($hassiteconfig) {
)
);
$ADMIN->add(
'taskconfig',
new admin_externalpage(
'adhoctasks',
new lang_string('adhoctasks', 'tool_task'),
"$CFG->wwwroot/$CFG->admin/tool/task/adhoctasks.php"
)
);
$ADMIN->add(
'taskconfig',
new admin_externalpage(