Skip to content

Commit b90c7b3

Browse files
committed
chore(files_trashbin): Add user details in log from Trashbin
Signed-off-by: Louis Chemineau <louis@chmn.me>
1 parent b03ffab commit b90c7b3

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

apps/files_trashbin/lib/Trashbin.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,13 @@ protected static function deleteFiles(array $files, string $user, int|float $ava
880880
foreach ($files as $file) {
881881
if ($availableSpace < 0 && $expiration->isExpired($file['mtime'], true)) {
882882
$tmp = self::delete($file['name'], $user, $file['mtime']);
883-
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']);
883+
Server::get(LoggerInterface::class)->info(
884+
'remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota) for user "{user}"',
885+
[
886+
'app' => 'files_trashbin',
887+
'user' => $user,
888+
]
889+
);
884890
$availableSpace += $tmp;
885891
$size += $tmp;
886892
} else {
@@ -911,16 +917,20 @@ public static function deleteExpiredFiles($files, $user) {
911917
$size += self::delete($filename, $user, $timestamp);
912918
$count++;
913919
} catch (NotPermittedException $e) {
914-
Server::get(LoggerInterface::class)->warning('Removing "' . $filename . '" from trashbin failed.',
920+
Server::get(LoggerInterface::class)->warning('Removing "' . $filename . '" from trashbin failed for user "{user}"',
915921
[
916922
'exception' => $e,
917923
'app' => 'files_trashbin',
924+
'user' => $user,
918925
]
919926
);
920927
}
921928
Server::get(LoggerInterface::class)->info(
922-
'Remove "' . $filename . '" from trashbin because it exceeds max retention obligation term.',
923-
['app' => 'files_trashbin']
929+
'Remove "' . $filename . '" from trashbin for user "{user}" because it exceeds max retention obligation term.',
930+
[
931+
'app' => 'files_trashbin',
932+
'user' => $user,
933+
],
924934
);
925935
} else {
926936
break;

0 commit comments

Comments
 (0)