Skip to content

Avoid immediate re-expiration of accounts #873

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

Merged
nickvergessen merged 3 commits into from
Jun 5, 2025
Merged

Avoid immediate re-expiration of accounts #873

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca0fecf
chore: improve debug logging in RetentionService
salmart-dev May 28, 2025
ab1c126
fix: avoid disabling user again when re-enabled...
salmart-dev May 28, 2025
aed567e
chore(cs): Apply autofixes
nickvergessen Jun 5, 2025
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
Next Next commit
chore: improve debug logging in RetentionService 
Signed-off-by: Salvatore Martire <[email protected]>
  • Loading branch information
@salmart-dev @nickvergessen
salmart-dev authored and nickvergessen committed Jun 5, 2025
commit ca0fecfe08818ba7fa344988e418fb06b36975f8
4 changes: 3 additions & 1 deletion lib/Service/RetentionService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ public function executeRetentionPolicy(IUser $user): ?bool {
$this->logger->debug('Account already disabled, continuing with potential deletion: ' . $user->getUID());
} catch (SkipUserException $e) {
// Not disabling yet, continue with checking deletion
$this->logger->debug("Disable: {$e->getMessage()}", $e->getLogParameters());
}
} else {
$this->logger->debug('No account disabling policy enabled for account: ' . $user->getUID());
Expand All @@ -183,6 +184,7 @@ public function executeRetentionPolicy(IUser $user): ?bool {
return true;
} catch (SkipUserException $e) {
// Not deleting yet, continue with checking reminders
$this->logger->debug("Delete: {$e->getMessage()}", $e->getLogParameters());
}
} else {
$this->logger->debug('No account retention policy enabled for account: ' . $user->getUID());
Expand All @@ -202,7 +204,7 @@ public function executeRetentionPolicy(IUser $user): ?bool {

$this->sendReminder($user, $lastActivity, $policyDays, $policyDaysDisable);
} catch (SkipUserException $e) {
$this->logger->debug($e->getMessage(), $e->getLogParameters());
$this->logger->debug("Reminder: {$e->getMessage()}", $e->getLogParameters());
continue;
}
}
Expand Down