Skip to content

Avoid creating unnecessary config log entries, and delete entries that were created incorrectly #2867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: MOODLE_401_STABLE
Choose a base branch
from
Open

Avoid creating unnecessary config log entries, and delete entries that were created incorrectly #2867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions local/o365/classes/feature/calsync/task/importfromoutlook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,6 @@ public function execute() {
$calsubs->close();
\local_o365\feature\calsync\observers::set_event_import(false);

$existingcalsyncinlastrunsetting = get_config('local_o365', 'calsyncinlastrun');
if ($existingcalsyncinlastrunsetting != $starttime) {
add_to_config_log('calsyncinlastrun', $existingcalsyncinlastrunsetting, $starttime, 'local_o365');
}
set_config('calsyncinlastrun', $starttime, 'local_o365');
return true;
}
Expand Down
15 changes: 3 additions & 12 deletions local/o365/classes/feature/calsync/task/syncoldevents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,7 @@ protected function sync_siteevents($timecreated) {
}
}
$events->close();
$existingcalsitelastsyncsetting = get_config('local_o365', 'cal_site_lastsync');
if ($existingcalsitelastsyncsetting != $timestart) {
add_to_config_log('cal_site_lastsync', $existingcalsitelastsyncsetting, $timestart, 'local_o365');
}

set_config('cal_site_lastsync', $timestart, 'local_o365');
return true;
}
Expand Down Expand Up @@ -337,10 +334,7 @@ protected function sync_courseevents($courseid, $timecreated) {
$lastcoursesync = [$courseid => $timestart];
}
$lastcoursesync = serialize($lastcoursesync);
$existingcalcourselastsyncsetting = get_config('local_o365', 'cal_course_lastsync');
if ($existingcalcourselastsyncsetting != $lastcoursesync) {
add_to_config_log('cal_course_lastsync', $existingcalcourselastsyncsetting, $lastcoursesync, 'local_o365');
}

set_config('cal_course_lastsync', $lastcoursesync, 'local_o365');

return true;
Expand Down Expand Up @@ -443,10 +437,7 @@ protected function sync_userevents($userid, $timecreated) {
$lastusersync = [$userid => $timestart];
}
$lastusersync = serialize($lastusersync);
$existingcaluserlastsyncsetting = get_config('local_o365', 'cal_user_lastsync');
if ($existingcaluserlastsyncsetting != $lastusersync) {
add_to_config_log('cal_user_lastsync', $existingcaluserlastsyncsetting, $lastusersync, 'local_o365');
}

set_config('cal_user_lastsync', $lastusersync, 'local_o365');

return true;
Expand Down
2 changes: 0 additions & 2 deletions local/o365/classes/feature/coursesync/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,9 +1112,7 @@ public function update_teams_cache(): bool {
$this->mtrace('');

// Set last updated timestamp.
$existingteamscahceupdatedsetting = get_config('local_o365', 'teamscacheupdated');
$timeupdated = time();
add_to_config_log('teamscacheupdated', $existingteamscahceupdatedsetting, $timeupdated, 'local_o365');
set_config('teamscacheupdated', $timeupdated, 'local_o365');

return true;
Expand Down
12 changes: 0 additions & 12 deletions local/o365/classes/oauth2/apptoken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,6 @@ protected function update_stored_token($existingtoken, $newtoken) {
}
$tokens[$newtoken['tokenresource']] = $newtoken;
$tokens = serialize($tokens);
$existingapptokenssetting = get_config('local_o365', 'apptokens');
if ($existingapptokenssetting != $tokens) {
add_to_config_log('apptokens', $existingapptokenssetting, $tokens, 'local_o365');
}
set_config('apptokens', $tokens, 'local_o365');
return true;
}
Expand All @@ -250,10 +246,6 @@ protected function delete_stored_token($existingtoken) {
unset($tokens[$existingtoken['tokenresource']]);
}
$tokens = serialize($tokens);
$existingapptokenssetting = get_config('local_o365', 'apptokens');
if ($existingapptokenssetting != $tokens) {
add_to_config_log('apptokens', $existingapptokenssetting, $tokens, 'local_o365');
}
set_config('apptokens', $tokens, 'local_o365');
return true;
}
Expand Down Expand Up @@ -288,10 +280,6 @@ public static function store_new_token($userid, $token, $expiry, $refreshtoken,
];
$tokens[$tokenresource] = $newtoken;
$tokens = serialize($tokens);
$existingapptokenssetting = get_config('local_o365', 'apptokens');
if ($existingapptokenssetting != $tokens) {
add_to_config_log('apptokens', $existingapptokenssetting, $tokens, 'local_o365');
}
set_config('apptokens', $tokens, 'local_o365');
return $newtoken;
}
Expand Down
14 changes: 0 additions & 14 deletions local/o365/classes/task/usersync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ protected function store_token($name, $value) {
if (empty($value)) {
$value = '';
}
$existingtaskusersynclastsetting = get_config('local_o365', 'task_usersync_last' . $name);
if ($existingtaskusersynclastsetting != $value) {
add_to_config_log('task_usersync_last' . $name, $existingtaskusersynclastsetting, $value, 'local_o365');
}
set_config('task_usersync_last' . $name, $value, 'local_o365');
}

Expand Down Expand Up @@ -182,18 +178,8 @@ public function execute() {
$currenthour = date('H');
$currentminute = date('i');
if ($currenthour > $suspensiontaskhour) {
$existingtaskusersynclastdeletesetting = get_config('local_o365', 'task_usersync_lastdelete');
if ($existingtaskusersynclastdeletesetting != date('Ymd')) {
add_to_config_log('task_usersync_lastdelete', $existingtaskusersynclastdeletesetting, date('Ymd'),
'local_o365');
}
set_config('task_usersync_lastdelete', date('Ymd'), 'local_o365');
} else if (($currenthour == $suspensiontaskhour) && ($currentminute >= $suspensiontaskminute)) {
$existingtaskusersynclastdeletesetting = get_config('local_o365', 'task_usersync_lastdelete');
if ($existingtaskusersynclastdeletesetting != date('Ymd')) {
add_to_config_log('task_usersync_lastdelete', $existingtaskusersynclastdeletesetting, date('Ymd'),
'local_o365');
}
set_config('task_usersync_lastdelete', date('Ymd'), 'local_o365');
} else {
$rundelete = false;
Expand Down
23 changes: 23 additions & 0 deletions local/o365/db/upgrade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,5 +1304,28 @@ function xmldb_local_o365_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2022112839, 'local', 'o365');
}

if ($oldversion < 2022112851) {
// Delete config log entries created by mistake.
$confignames = ['apptokens', 'teamscacheupdated', 'calsyncinlastrun', 'task_usersync_lastdeltatoken',
'task_usersync_lastdelete', 'cal_site_lastsync', 'cal_course_lastsync', 'cal_user_lastsync'];

foreach ($confignames as $configname) {
$configlogentryids = $DB->get_fieldset_select('config_log', 'id', "plugin = 'local_o365' AND name = :name",
['name' => $configname]);
if ($configlogentryids) {
[$logentryidsql, $params] = $DB->get_in_or_equal($configlogentryids, SQL_PARAMS_NAMED);
// Delete logstore_standard_log records.
$DB->delete_records_select('logstore_standard_log', 'eventname = :eventname AND objectid ' . $logentryidsql,
array_merge($params, ['eventname' => '\core\event\config_log_created']));

// Delete config_log records.
$DB->delete_records('config_log', ['plugin' => 'local_o365', 'name' => $configname]);
}
}

// O365 savepoint reached.
upgrade_plugin_savepoint(true, 2022112851, 'local', 'o365');
}

return true;
}
2 changes: 1 addition & 1 deletion local/o365/version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

defined('MOODLE_INTERNAL') || die();

$plugin->version = 2022112850;
$plugin->version = 2022112851;
$plugin->requires = 2022112800;
$plugin->release = '4.1.11';
$plugin->component = 'local_o365';
Expand Down