mirror/moodle-auth_outage
1
0
Fork 0
mirror of https://github.com/catalyst/moodle-auth_outage.git synced 2026-05-17 05:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #37 - Ensure exceptions in the inject code, executed in virtually all pages, does not put the whole site down.

Browse Source
This commit is contained in:
Daniel Thee Roperto
2016-09-19 18:17:44 +10:00
parent 54b72de472
commit 6a81fd6304
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
classes/outagelib.php
View File

@@ -17,6 +17,7 @@
namespace auth_outage;
use auth_outage_renderer;
use Exception;
use moodle_url;
if (!defined('MOODLE_INTERNAL')) {
@@ -66,27 +67,33 @@ class outagelib {
}
self::$initialized = true;
// Check for a previewing outage, then for an active outage.
$previewid = optional_param('auth_outage_preview', null, PARAM_INT);
$time = time();
if (is_null($previewid)) {
if (!$active = outagedb::get_active()) {
return;
// Ensure we do not kill the whole website in case of an error.
try {
// Check for a previewing outage, then for an active outage.
$previewid = optional_param('auth_outage_preview', null, PARAM_INT);
$time = time();
if (is_null($previewid)) {
if (!$active = outagedb::get_active()) {
return;
}
} else {
if (!$active = outagedb::get_by_id($previewid)) {
return;
}
// Delta is in seconds, setting the time our warning bar will consider relative to the outage start time.
$time = $active->starttime + optional_param('auth_outage_delta', 0, PARAM_INT);
if (!$active->is_active($time)) {
return;
}
}
} else {
if (!$active = outagedb::get_by_id($previewid)) {
return;
}
// Delta is in seconds, setting the time our warning bar will consider relative to the outage start time.
$time = $active->starttime + optional_param('auth_outage_delta', 0, PARAM_INT);
if (!$active->is_active($time)) {
return;
}
}
// There is a previewing or active outage.
$CFG->additionalhtmltopofbody = self::get_renderer()->renderoutagebar($active, $time)
. $CFG->additionalhtmltopofbody;
// There is a previewing or active outage.
$CFG->additionalhtmltopofbody = self::get_renderer()->renderoutagebar($active, $time)
. $CFG->additionalhtmltopofbody;
} catch (Exception $e) {
debugging('Exception occured while injecting our code: ' . $e->getMessage());
debugging($e->getTraceAsString(), DEBUG_DEVELOPER);
}
}
public static function get_config() {