From 5a94ced5f763be99212a984640f607f9a51336b5 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Sun, 8 Oct 2023 16:34:55 +0200 Subject: [PATCH 1/2] Catch Imaginary processing errors Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- lib/private/Preview/Imaginary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Preview/Imaginary.php b/lib/private/Preview/Imaginary.php index 16b164700781f..7abc12e9dfd5d 100644 --- a/lib/private/Preview/Imaginary.php +++ b/lib/private/Preview/Imaginary.php @@ -149,7 +149,7 @@ public function getCroppedThumbnail(File $file, int $maxX, int $maxY, bool $crop 'timeout' => 120, 'connect_timeout' => 3, ]); - } catch (\Exception $e) { + } catch (\GuzzleHttp\Exception\ClientException | \Exception $e) { $this->logger->info('Imaginary preview generation failed: ' . $e->getMessage(), [ 'exception' => $e, ]); From 09b9f5bd00da861c63a10f9fd2f6e6ca26cc8659 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Fri, 27 Oct 2023 07:54:39 +0200 Subject: [PATCH 2/2] Use \Throwable instead Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- lib/private/Preview/Imaginary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Preview/Imaginary.php b/lib/private/Preview/Imaginary.php index 7abc12e9dfd5d..ba5bd25a0189b 100644 --- a/lib/private/Preview/Imaginary.php +++ b/lib/private/Preview/Imaginary.php @@ -149,7 +149,7 @@ public function getCroppedThumbnail(File $file, int $maxX, int $maxY, bool $crop 'timeout' => 120, 'connect_timeout' => 3, ]); - } catch (\GuzzleHttp\Exception\ClientException | \Exception $e) { + } catch (\Throwable $e) { $this->logger->info('Imaginary preview generation failed: ' . $e->getMessage(), [ 'exception' => $e, ]);