upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #51837 from nextcloud/artonge/chore/increase_log_in_trashbin

Browse source 
chore(files_trashbin): Add user details in log from Trashbin
This commit is contained in:
Louis 2025-04-07 15:00:27 +02:00 committed by GitHub
commit 13af20ab3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/files_trashbin/lib/Trashbin.php
View file

@ -880,7 +880,13 @@ class Trashbin implements IEventListener {
foreach ($files as $file) {
if ($availableSpace < 0 && $expiration->isExpired($file['mtime'], true)) {
$tmp = self::delete($file['name'], $user, $file['mtime']);
Server::get(LoggerInterface::class)->info('remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota)', ['app' => 'files_trashbin']);
Server::get(LoggerInterface::class)->info(
'remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota) for user "{user}"',
[
'app' => 'files_trashbin',
'user' => $user,
]
);
$availableSpace += $tmp;
$size += $tmp;
} else {
@ -911,16 +917,20 @@ class Trashbin implements IEventListener {
$size += self::delete($filename, $user, $timestamp);
$count++;
} catch (NotPermittedException $e) {
Server::get(LoggerInterface::class)->warning('Removing "' . $filename . '" from trashbin failed.',
Server::get(LoggerInterface::class)->warning('Removing "' . $filename . '" from trashbin failed for user "{user}"',
[
'exception' => $e,
'app' => 'files_trashbin',
'user' => $user,
]
);
}
Server::get(LoggerInterface::class)->info(
'Remove "' . $filename . '" from trashbin because it exceeds max retention obligation term.',
['app' => 'files_trashbin']
'Remove "' . $filename . '" from trashbin for user "{user}" because it exceeds max retention obligation term.',
[
'app' => 'files_trashbin',
'user' => $user,
],
);
} else {
break;