Skip to content

[stable30] fix: Catch exceptions when expiring trashbin #51911

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
artonge merged 2 commits into from
Apr 3, 2025
Merged

[stable30] fix: Catch exceptions when expiring trashbin #51911

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d25a563
chore: Use iterator in ExpireTrash command
artonge Apr 2, 2025
b439b93
fix: Catch exceptions when expiring trashbin
artonge Apr 3, 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: Use iterator in ExpireTrash command 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge
artonge committed Apr 3, 2025
commit d25a563d9737855704eb4355275cddcacbb83284
9 changes: 6 additions & 3 deletions apps/files_trashbin/lib/Command/ExpireTrash.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class ExpireTrash extends Command {
* @param IUserManager|null $userManager
* @param Expiration|null $expiration
*/
public function __construct(?IUserManager $userManager = null,
public function __construct(private LoggerInterface $logger,
?IUserManager $userManager = null,
?Expiration $expiration = null) {
parent::__construct();

Expand Down Expand Up @@ -74,10 +75,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
} else {
$p = new ProgressBar($output);
$p->start();
$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {

$users = $this->userManager->getSeenUsers();
foreach ($users as $user) {
$p->advance();
$this->expireTrashForUser($user);
});
}
$p->finish();
$output->writeln('');
}
Expand Down