mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 14:27:22 +01:00
a4d64bd71b
Prior to this change, the tool_task_cronrunning check had very tight limits for checking the last cron interval and comparing it to the expected frequency. When a cron job should take 1:00 min and the last run was 1:02 min it complained that there was 1:02 between the last two runs of the cron maintenance script and it should run every 1:00. This change makes the check a bit more relaxed and adds an additional minute on top of the expectedfrequency to give the cron job some time. Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
129 lines
4.2 KiB
PHP
129 lines
4.2 KiB
PHP
<?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/>.
|
|
|
|
/**
|
|
* Cron running check
|
|
*
|
|
* @package tool_task
|
|
* @copyright 2020 Brendan Heywood (brendan@catalyst-au.net)
|
|
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
*/
|
|
|
|
namespace tool_task\check;
|
|
|
|
defined('MOODLE_INTERNAL') || die();
|
|
|
|
use core\check\check;
|
|
use core\check\result;
|
|
/**
|
|
* Cron running check
|
|
*
|
|
* @package tool_task
|
|
* @copyright 2020 Brendan Heywood (brendan@catalyst-au.net)
|
|
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
|
*/
|
|
class cronrunning extends check {
|
|
|
|
/**
|
|
* Constructor
|
|
*/
|
|
public function __construct() {
|
|
global $CFG;
|
|
$this->id = 'cronrunning';
|
|
$this->name = get_string('checkcronrunning', 'tool_task');
|
|
if (empty($CFG->cronclionly)) {
|
|
$this->actionlink = new \action_link(
|
|
new \moodle_url('/admin/cron.php'),
|
|
get_string('cron', 'admin'));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Return result
|
|
* @return result
|
|
*/
|
|
public function get_result() : result {
|
|
global $CFG;
|
|
|
|
// Eventually this should replace cron_overdue_warning and
|
|
// cron_infrequent_warning.
|
|
$lastcron = get_config('tool_task', 'lastcronstart');
|
|
$expectedfrequency = $CFG->expectedcronfrequency ?? MINSECS;
|
|
|
|
$delta = time() - $lastcron;
|
|
|
|
$lastcroninterval = get_config('tool_task', 'lastcroninterval');
|
|
|
|
$formatdelta = format_time($delta);
|
|
$formatexpected = format_time($expectedfrequency);
|
|
$formatinterval = format_time($lastcroninterval);
|
|
|
|
// Inform user the time since last cron start.
|
|
$details = get_string('lastcronstart', 'tool_task', $formatdelta);
|
|
|
|
if ($delta > $expectedfrequency + MINSECS) {
|
|
$status = result::WARNING;
|
|
|
|
if ($delta > DAYSECS) {
|
|
$status = result::CRITICAL;
|
|
}
|
|
|
|
if (empty($lastcron)) {
|
|
if (empty($CFG->cronclionly)) {
|
|
$url = new \moodle_url('/admin/cron.php');
|
|
$summary = get_string('cronwarningneverweb', 'admin', [
|
|
'url' => $url->out(),
|
|
'expected' => $formatexpected,
|
|
]);
|
|
} else {
|
|
$summary = get_string('cronwarningnever', 'admin', [
|
|
'expected' => $formatexpected,
|
|
]);
|
|
}
|
|
} else if (empty($CFG->cronclionly)) {
|
|
$url = new \moodle_url('/admin/cron.php');
|
|
$summary = get_string('cronwarning', 'admin', [
|
|
'url' => $url->out(),
|
|
'actual' => $formatdelta,
|
|
'expected' => $formatexpected,
|
|
]);
|
|
} else {
|
|
$summary = get_string('cronwarningcli', 'admin', [
|
|
'actual' => $formatdelta,
|
|
'expected' => $formatexpected,
|
|
]);
|
|
}
|
|
return new result($status, $summary, $details);
|
|
}
|
|
|
|
// Add MINSECS to avoid spurious warning if cron is only a few seconds overdue.
|
|
if ($lastcroninterval > $expectedfrequency + MINSECS) {
|
|
$status = result::WARNING;
|
|
$summary = get_string('croninfrequent', 'admin', [
|
|
'actual' => $formatinterval,
|
|
'expected' => $formatexpected,
|
|
]);
|
|
return new result($status, $summary, $details);
|
|
}
|
|
|
|
$status = result::OK;
|
|
$summary = get_string('cronok', 'tool_task');
|
|
|
|
return new result($status, $summary, $details);
|
|
}
|
|
}
|
|
|