moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'log_cleanup_29' of https://github.com/tlevi/moodle

Browse source
This commit is contained in:
Andrew Nicols 2015-03-31 12:56:31 +08:00
commit 78045f6583
4 changed files with 118 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
admin/tool/log/store/legacy/classes/task/cleanup_task.php
View file

@ -44,11 +44,26 @@ class cleanup_task extends \core\task\scheduled_task {
public function execute() { public function execute() {
global $CFG, $DB; global $CFG, $DB;
// Delete old logs to save space (this might need a timer to slow it down...). if (empty($CFG->loglifetime)) {
if (!empty($CFG->loglifetime)) { // Value in days. return;
$loglifetime = time(0) - ($CFG->loglifetime * 3600 * 24);
$DB->delete_records_select("log", "time < ?", array($loglifetime));
mtrace(" Deleted old legacy log records");
} }
$loglifetime = time() - ($CFG->loglifetime * 3600 * 24); // Value in days.
$lifetimep = array($loglifetime);
$start = time();
while ($min = $DB->get_field_select("log", "MIN(time)", "time < ?", $lifetimep)) {
// Break this down into chunks to avoid transaction for too long and generally thrashing database.
// Experiments suggest deleting one day takes up to a few seconds; probably a reasonable chunk size usually.
// If the cleanup has just been enabled, it might take e.g a month to clean the years of logs.
$params = array(min($min + 3600 * 24, $loglifetime));
$DB->delete_records_select("log", "time < ?", $params);
if (time() > $start + 300) {
// Do not churn on log deletion for too long each run.
break;
}
}
mtrace(" Deleted old legacy log records");
} }
} }

35
admin/tool/log/store/legacy/tests/store_test.php
View file

@ -273,4 +273,39 @@ class logstore_legacy_store_testcase extends advanced_testcase {
$this->assertContains($expectedreport, $reports); $this->assertContains($expectedreport, $reports);
} }
} }
/**
* Test that the legacy log cleanup works correctly.
*/
public function test_cleanup_task() {
global $DB;
$this->resetAfterTest();
// Create some records spread over various days; test multiple iterations in cleanup.
$record = (object) array('time' => time());
$DB->insert_record('log', $record);
$record->time -= 3600 * 24 * 30;
$DB->insert_record('log', $record);
$record->time -= 3600 * 24 * 30;
$DB->insert_record('log', $record);
$record->time -= 3600 * 24 * 30;
$DB->insert_record('log', $record);
$this->assertEquals(4, $DB->count_records('log'));
// Remove all logs before "today".
set_config('loglifetime', 1);
try {
ob_start();
$clean = new \logstore_legacy\task\cleanup_task();
$clean->execute();
ob_end_clean();
} catch (Exception $e) {
ob_end_clean();
throw $e;
}
$this->assertEquals(1, $DB->count_records('log'));
}
} }

25
admin/tool/log/store/standard/classes/task/cleanup_task.php
View file

@ -43,12 +43,29 @@ class cleanup_task extends \core\task\scheduled_task {
*/ */
public function execute() { public function execute() {
global $DB; global $DB;
$loglifetime = (int)get_config('logstore_standard', 'loglifetime'); $loglifetime = (int)get_config('logstore_standard', 'loglifetime');
if ($loglifetime > 0) { if (empty($loglifetime) || $loglifetime < 0) {
$loglifetime = time() - ($loglifetime * 3600 * 24); // Value in days. return;
$DB->delete_records_select("logstore_standard_log", "timecreated < ?", array($loglifetime));
mtrace(" Deleted old log records from standard store.");
} }
$loglifetime = time() - ($loglifetime * 3600 * 24); // Value in days.
$lifetimep = array($loglifetime);
$start = time();
while ($min = $DB->get_field_select("logstore_standard_log", "MIN(timecreated)", "timecreated < ?", $lifetimep)) {
// Break this down into chunks to avoid transaction for too long and generally thrashing database.
// Experiments suggest deleting one day takes up to a few seconds; probably a reasonable chunk size usually.
// If the cleanup has just been enabled, it might take e.g a month to clean the years of logs.
$params = array(min($min + 3600 * 24, $loglifetime));
$DB->delete_records_select("logstore_standard_log", "timecreated < ?", $params);
if (time() > $start + 300) {
// Do not churn on log deletion for too long each run.
break;
}
}
mtrace(" Deleted old log records from standard store.");
} }
} }

42
admin/tool/log/store/standard/tests/store_test.php
View file

@ -276,4 +276,46 @@ class logstore_standard_store_testcase extends advanced_testcase {
get_log_manager(true); get_log_manager(true);
} }
/**
* Test that the standard log cleanup works correctly.
*/
public function test_cleanup_task() {
global $DB;
$this->resetAfterTest();
// Create some records spread over various days; test multiple iterations in cleanup.
$ctx = context_course::instance(1);
$record = (object) array(
'edulevel' => 0,
'contextid' => $ctx->id,
'contextlevel' => $ctx->contextlevel,
'contextinstanceid' => $ctx->instanceid,
'userid' => 1,
'timecreated' => time(),
);
$DB->insert_record('logstore_standard_log', $record);
$record->timecreated -= 3600 * 24 * 30;
$DB->insert_record('logstore_standard_log', $record);
$record->timecreated -= 3600 * 24 * 30;
$DB->insert_record('logstore_standard_log', $record);
$record->timecreated -= 3600 * 24 * 30;
$DB->insert_record('logstore_standard_log', $record);
$this->assertEquals(4, $DB->count_records('logstore_standard_log'));
// Remove all logs before "today".
set_config('loglifetime', 1, 'logstore_standard');
try {
ob_start();
$clean = new \logstore_standard\task\cleanup_task();
$clean->execute();
ob_end_clean();
} catch (Exception $e) {
ob_end_clean();
throw $e;
}
$this->assertEquals(1, $DB->count_records('logstore_standard_log'));
}
} }